From 15b2258b772b05d940ec784aa69c03d94a10c5fb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 16 May 2013 17:16:39 +0200 Subject: [PATCH] xbps-pkgdb: fix issue #9 (remove old code that broke pkgdb mem vs disk comparisions). --- NEWS | 3 +++ bin/xbps-pkgdb/check.c | 16 ---------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index 909d3e0e..da9e2f0c 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ xbps-0.25 (???): + * xbps-pkgdb(8): removed old code that isn't needed anymore in the 'check' mode. + This fixes issue #9 (https://github.com/xtraeme/xbps/issues/9). + xbps-0.24 (2013-05-02): * xbps-rindex(8): added -f, --force flag to forcefully register a package even diff --git a/bin/xbps-pkgdb/check.c b/bin/xbps-pkgdb/check.c index 86198e8f..a20d7361 100644 --- a/bin/xbps-pkgdb/check.c +++ b/bin/xbps-pkgdb/check.c @@ -127,7 +127,6 @@ check_pkg_integrity(struct xbps_handle *xhp, prop_dictionary_t pkgd, const char *pkgname) { - prop_array_t rundeps; prop_dictionary_t opkgd, propsd; const char *sha256; char *buf; @@ -158,21 +157,6 @@ check_pkg_integrity(struct xbps_handle *xhp, prop_object_release(propsd); return 1; } - /* - * Check if pkgdb pkg has been converted to 0.19 format, - * which adds "run_depends" array object. - */ - rundeps = prop_dictionary_get(opkgd, "run_depends"); - if (rundeps == NULL) { - rundeps = prop_dictionary_get(propsd, "run_depends"); - if (rundeps == NULL) - rundeps = prop_array_create(); - - prop_dictionary_set(opkgd, "run_depends", rundeps); - /* remove requiredby object, unneeded since 0.19 */ - prop_dictionary_remove(opkgd, "requiredby"); - } - /* * Check pkg metadata signature. */