pkg_get_installed_files() returns a list of files with the offline root path
already included, so don't add it again.
Fix some error message formatting while here.
git-svn-id: http://opkg.googlecode.com/svn/trunk@532
e8e0d7a0-c8d9-11dd-a880-
a1081c7ac358
*/
str_list_t *files_list;
str_list_elt_t *iter, *niter;
*/
str_list_t *files_list;
str_list_elt_t *iter, *niter;
int clashes = 0;
files_list = pkg_get_installed_files(pkg);
int clashes = 0;
files_list = pkg_get_installed_files(pkg);
for (iter = str_list_first(files_list), niter = str_list_next(files_list, iter);
iter;
iter = niter, niter = str_list_next(files_list, iter)) {
for (iter = str_list_first(files_list), niter = str_list_next(files_list, iter);
iter;
iter = niter, niter = str_list_next(files_list, iter)) {
- char *root_filename;
- char *filename = (char *) iter->data;
- root_filename = root_filename_alloc(filename);
- if (file_exists(root_filename) && (! file_is_dir(root_filename))) {
+ filename = (char *) iter->data;
+ if (file_exists(filename) && (! file_is_dir(filename))) {
pkg_t *owner;
pkg_t *obs;
pkg_t *owner;
pkg_t *obs;
- if (backup_exists_for(root_filename)) {
+ if (backup_exists_for(filename)) {
"\tBut that file is already provided by package ",
pkg->name, filename);
if (owner) {
"\tBut that file is already provided by package ",
pkg->name, filename);
if (owner) {
- opkg_msg(ERROR, "%s\n", owner->name);
+ opkg_message(ERROR, "%s\n", owner->name);
- opkg_msg(ERROR, "<no package>\n"
+ opkg_message(ERROR, "<no package>\n"
"Please move this file out of the way and try again.\n");
}
clashes++;
}
"Please move this file out of the way and try again.\n");
}
clashes++;
}
}
pkg_free_installed_files(pkg);
}
pkg_free_installed_files(pkg);