diff options
| author | graham.gower@gmail.com <graham.gower@gmail.com@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2011-02-20 23:24:42 (EST) |
|---|---|---|
| committer | graham.gower@gmail.com <graham.gower@gmail.com@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2011-02-20 23:24:42 (EST) |
| commit | 0eed2e07feb747bfb79cbe01c5ec546286578088 (patch) | |
| tree | 7d586196c0a6ba41367d86cb1eb361fccf370a1c | |
| parent | 4510dc50d303256dd5f74681119c826c329f6939 (diff) | |
Get the owner of the file_name after the offline root has been stripped.
Fixes a problem where the old package maintains that it owns a file even
though the new pkg has been installed with --force-overwrite.
git-svn-id: http://opkg.googlecode.com/svn/trunk@605 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
| -rw-r--r-- | libopkg/pkg_hash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c index 59b285d..b7f1573 100644 --- a/libopkg/pkg_hash.c +++ b/libopkg/pkg_hash.c @@ -650,7 +650,7 @@ file_hash_get_file_owner(const char *file_name) void file_hash_set_file_owner(const char *file_name, pkg_t *owning_pkg) { - pkg_t *old_owning_pkg = hash_table_get(&conf->file_hash, file_name); + pkg_t *old_owning_pkg; int file_name_len = strlen(file_name); if (file_name[file_name_len -1] == '/') @@ -658,6 +658,7 @@ file_hash_set_file_owner(const char *file_name, pkg_t *owning_pkg) file_name = strip_offline_root(file_name); + old_owning_pkg = hash_table_get(&conf->file_hash, file_name); hash_table_insert(&conf->file_hash, file_name, owning_pkg); if (old_owning_pkg) { |