summaryrefslogtreecommitdiffstats
path: root/libopkg
diff options
context:
space:
mode:
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-16 19:17:40 (EST)
committer graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-16 19:17:40 (EST)
commitcd3404e22aa9baba2c617ce4d4d7f53e3f54853c (patch)
treeb87a407db2148e5fecf006ae309b165d09f4cdc3 /libopkg
parentf3b6367701e4d9062b30f44c18fd867a0c038fde (diff)
Pass the correct file to diff when using an offline_root.
git-svn-id: http://opkg.googlecode.com/svn/trunk@319 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg')
-rw-r--r--libopkg/opkg_install.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c
index 834916d..02a2be4 100644
--- a/libopkg/opkg_install.c
+++ b/libopkg/opkg_install.c
@@ -1560,7 +1560,7 @@ static int resolve_conffiles(opkg_conf_t *conf, pkg_t *pkg)
if (conf->force_maintainer) {
opkg_message(conf, OPKG_NOTICE, "Conffile %s using maintainer's setting.\n", cf_backup);
} else if (conf->force_defaults
- || user_prefers_old_conffile(cf->name, cf_backup) ) {
+ || user_prefers_old_conffile(root_filename, cf_backup) ) {
rename(cf_backup, root_filename);
}
}