pkg->name);
tmp = unresolved;
while (*unresolved) {
- opkg_msg(ERROR, "\t%s", *unresolved);
+ opkg_message(ERROR, "\t%s", *unresolved);
free(*unresolved);
unresolved++;
}
iter = niter, niter = str_list_next(new_list, niter)) {
char *new_file = (char *)iter->data;
pkg_t *owner = file_hash_get_file_owner(new_file);
- if (!new_file)
- opkg_msg(ERROR, "Null new_file for new_pkg=%s\n", new_pkg->name);
- if (!owner || (owner == old_pkg))
+ pkg_t *obs = hash_table_get(&conf->obs_file_hash, new_file);
+
+ opkg_msg(DEBUG2, "%s: new_pkg=%s wants file %s, from owner=%s\n",
+ __func__, new_pkg->name, new_file, owner?owner->name:"<NULL>");
+
+ if (!owner || (owner == old_pkg) || obs)
file_hash_set_file_owner(new_file, new_pkg);
}
iter = niter, niter = str_list_next(old_list, niter)) {
char *old_file = (char *)iter->data;
pkg_t *owner = file_hash_get_file_owner(old_file);
- if (owner == old_pkg) {
+ if (!owner || (owner == old_pkg)) {
/* obsolete */
hash_table_insert(&conf->obs_file_hash, old_file, old_pkg);
}
static int
pkg_remove_orphan_dependent(pkg_t *pkg, pkg_t *old_pkg)
{
- int i, j, k, l, found;
+ int i, j, k, l, found,r, err = 0;
int n_deps;
pkg_t *p;
struct compound_depend *cd0, *cd1;
* which we need to ignore during removal. */
p->state_flag |= SF_REPLACE;
- opkg_remove_pkg(p, 0);
+ r = opkg_remove_pkg(p, 0);
+ if (!err)
+ err = r;
} else
opkg_msg(INFO, "%s was autoinstalled and is "
"still required by %d "
}
}
- return 0;
+ return err;
}
/* returns number of installed replacees */
pkg->dest = old_pkg->dest;
rc = 0;
} else /* cmp == 0 */ {
- if (conf->force_reinstall) {
if(!conf->download_only)
- opkg_msg(NOTICE, "Reinstalling %s (%s) on %s...\n",
- pkg->name, new_version, old_pkg->dest->name);
- pkg->dest = old_pkg->dest;
- rc = 0;
- } else {
- if(!conf->download_only)
- opkg_msg(NOTICE, "%s (%s) already install on %s."
- " Not reinstalling.\n",
- pkg->name, new_version, old_pkg->dest->name);
- rc = 1;
- }
+ opkg_msg(NOTICE, "%s (%s) already install on %s.\n",
+ pkg->name, new_version, old_pkg->dest->name);
+ rc = 1;
}
free(old_version);
free(new_version);
return rc;
} else {
- char message_out[15] ;
- memset(message_out,'\x0',15);
- if ( message )
- strncpy( message_out,"Upgrading ",strlen("Upgrading ") );
- else
- strncpy( message_out,"Installing ",strlen("Installing ") );
- char *version = pkg_version_str_alloc(pkg);
-
- if(!conf->download_only)
- opkg_msg(NOTICE, "%s%s (%s) to %s...\n", message_out,
+ char message_out[15] ;
+ memset(message_out,'\x0',15);
+ if ( message )
+ strncpy( message_out,"Upgrading ",strlen("Upgrading ") );
+ else
+ strncpy( message_out,"Installing ",strlen("Installing ") );
+ char *version = pkg_version_str_alloc(pkg);
+
+ if(!conf->download_only)
+ opkg_msg(NOTICE, "%s%s (%s) to %s...\n", message_out,
pkg->name, version, pkg->dest->name);
- free(version);
- return 0;
+ free(version);
}
+ return 0;
}
*/
str_list_t *files_list;
str_list_elt_t *iter, *niter;
-
+ char *filename;
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)) {
- 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;
- if (backup_exists_for(root_filename)) {
+ if (backup_exists_for(filename)) {
continue;
}
"\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);
} else {
- 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++;
}
- free(root_filename);
}
pkg_free_installed_files(pkg);
static int
remove_obsolesced_files(pkg_t *pkg, pkg_t *old_pkg)
{
- int err;
+ int err = 0;
str_list_t *old_files;
str_list_elt_t *of;
str_list_t *new_files;
}
/* old file is obsolete */
- opkg_msg(INFO, "Removing obsolete file %s.\n", old);
+ opkg_msg(NOTICE, "Removing obsolete file %s.\n", old);
if (!conf->noaction) {
err = unlink(old);
if (err) {
pkg_free_installed_files(old_pkg);
pkg_free_installed_files(pkg);
- return 0;
+ return err;
}
static int
} else {
char *new_conffile;
sprintf_alloc(&new_conffile, "%s-opkg", root_filename);
- opkg_msg(NOTICE, "Existing conffile %s "
+ opkg_msg(ERROR, "Existing conffile %s "
"is different from the conffile in the new package."
" The new conffile will be placed at %s.\n",
root_filename, new_conffile);
old->version);
new = pkg_hash_fetch_best_installation_candidate_by_name(pkg_name);
- if (new == NULL)
+ if (new == NULL) {
+ opkg_msg(NOTICE, "Unknown package '%s'.\n", pkg_name);
return -1;
+ }
opkg_msg(DEBUG2, "Versions from pkg_hash_fetch:");
if ( old )
- opkg_msg(DEBUG2, " old %s ", old->version);
- opkg_msg(DEBUG2, " new %s\n", new->version);
+ opkg_message(DEBUG2, " old %s ", old->version);
+ opkg_message(DEBUG2, " new %s\n", new->version);
new->state_flag |= SF_USER;
if (old) {
"\n\t%s is available "
"\n\t%d was comparison result\n",
pkg_name, old_version, new_version, cmp);
- if (cmp == 0 && !conf->force_reinstall) {
+ if (cmp == 0) {
opkg_msg(NOTICE,
"Package %s (%s) installed in %s is up to date.\n",
old->name, old_version, old->dest->name);
pkg->architecture, pkg->name);
return -1;
}
- if (pkg->state_status == SS_INSTALLED && conf->force_reinstall == 0 && conf->nodeps == 0) {
+ if (pkg->state_status == SS_INSTALLED && conf->nodeps == 0) {
err = satisfy_dependencies_for(pkg);
if (err)
return -1;
installing pkg A, A deps B & B deps on A. So both B and A are
installed. Then A's installation is started resulting in an
uncecessary upgrade */
- if (pkg->state_status == SS_INSTALLED && conf->force_reinstall == 0)
+ if (pkg->state_status == SS_INSTALLED)
return 0;
err = verify_pkg_installable(pkg);
return 0;
/* point of no return: no unwinding after this */
- if (old_pkg && !conf->force_reinstall) {
+ if (old_pkg) {
old_pkg->state_want = SW_DEINSTALL;
if (old_pkg->state_flag & SF_NOPRUNE) {
opkg_msg(DEBUG, "pkg=%s old_state_flag=%x state_flag=%x\n",
pkg->name, old_state_flag, pkg->state_flag);
- if (old_pkg && !conf->force_reinstall) {
+ if (old_pkg)
old_pkg->state_status = SS_NOT_INSTALLED;
- }
time(&pkg->installed_time);
projects / oweals / opkg-lede.git / blobdiff