diff options
| -rw-r--r-- | libopkg/hash_table.c | 3 | ||||
| -rw-r--r-- | libopkg/opkg_cmd.c | 6 | ||||
| -rw-r--r-- | libopkg/opkg_install.c | 31 | ||||
| -rw-r--r-- | libopkg/pkg.c | 3 |
4 files changed, 0 insertions, 43 deletions
diff --git a/libopkg/hash_table.c b/libopkg/hash_table.c index df6ff4f..9e42da0 100644 --- a/libopkg/hash_table.c +++ b/libopkg/hash_table.c @@ -123,11 +123,9 @@ int hash_table_insert(hash_table_t *hash, const char *key, void *value) { int ndx= hash_index(hash, key); hash_entry_t *hash_entry = hash->entries + ndx; - if (0) opkg_message(NULL, OPKG_DEBUG2, "Function: %s. Inserting in hash for '%s' \n", __FUNCTION__, key); if (hash_entry->key) { if (strcmp(hash_entry->key, key) == 0) { /* alread in table, update the value */ - if (0) opkg_message(NULL, OPKG_DEBUG2, "Function: %s. Value already in hash for '%s' \n", __FUNCTION__, key); hash_entry->data = value; return 0; } else { @@ -136,7 +134,6 @@ int hash_table_insert(hash_table_t *hash, const char *key, void *value) * then add a new entry * before we can hook up the value */ - if (0) opkg_message(NULL, OPKG_DEBUG2, "Function: %s. Value already in hash by collision for '%s' \n", __FUNCTION__, key); while (hash_entry->next) { hash_entry = hash_entry->next; if (strcmp(hash_entry->key, key) == 0) { diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c index 807777e..2dd17b2 100644 --- a/libopkg/opkg_cmd.c +++ b/libopkg/opkg_cmd.c @@ -568,9 +568,6 @@ static int opkg_install_cmd(opkg_conf_t *conf, int argc, char **argv) } } - /* recheck to verify that all dependences are satisfied */ - if (0) opkg_satisfy_all_dependences(conf); - opkg_configure_packages(conf, NULL); write_status_files_if_changed(conf); @@ -632,9 +629,6 @@ static int opkg_upgrade_cmd(opkg_conf_t *conf, int argc, char **argv) pkg_vec_free(installed); } - /* recheck to verify that all dependences are satisfied */ - if (0) opkg_satisfy_all_dependences(conf); - opkg_configure_packages(conf, NULL); write_status_files_if_changed(conf); diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c index 61563d6..a67129e 100644 --- a/libopkg/opkg_install.c +++ b/libopkg/opkg_install.c @@ -1470,42 +1470,11 @@ static int remove_obsolesced_files(opkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg return 0; } -static int remove_obsolete_maintainer_scripts(opkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -{ - int i; - int err = 0; - char *globpattern; - glob_t globbuf; - if (0) { - if (!pkg->dest) { - opkg_message(conf, OPKG_ERROR, "%s: no dest for package %s\n", __FUNCTION__, pkg->name); - return -1; - } - sprintf_alloc(&globpattern, "%s/%s.*", pkg->dest->info_dir, pkg->name); - err = glob(globpattern, 0, NULL, &globbuf); - free(globpattern); - if (err) { - return err; - } - /* XXXX this should perhaps only remove the ones that are not overwritten in new package. Jamey 11/11/2003 */ - for (i = 0; i < globbuf.gl_pathc; i++) { - opkg_message(conf, OPKG_DEBUG, "Removing control file %s from old_pkg %s\n", - globbuf.gl_pathv[i], old_pkg->name); - if (!conf->noaction) - unlink(globbuf.gl_pathv[i]); - } - globfree(&globbuf); - } - return err; -} - static int install_maintainer_scripts(opkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) { int ret; char *prefix; - if (old_pkg) - remove_obsolete_maintainer_scripts(conf, pkg, old_pkg); sprintf_alloc(&prefix, "%s.", pkg->name); ret = pkg_extract_control_files_to_dir_with_prefix(pkg, pkg->dest->info_dir, diff --git a/libopkg/pkg.c b/libopkg/pkg.c index 48169ea..dc00186 100644 --- a/libopkg/pkg.c +++ b/libopkg/pkg.c @@ -410,9 +410,6 @@ int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status) if (!oldpkg->filename) oldpkg->filename = xstrdup(newpkg->filename); - if (0) - fprintf(stdout, "pkg=%s old local_filename=%s new local_filename=%s\n", - oldpkg->name, oldpkg->local_filename, newpkg->local_filename); if (!oldpkg->local_filename) oldpkg->local_filename = xstrdup(newpkg->local_filename); if (!oldpkg->tmp_unpack_dir) |