- strip header tags for erased as well as installed transactionElements.

CVS patchset: 5167
CVS date: 2001/11/10 01:39:50

44 files changed, 924 insertions, 843 deletions

diff --git a/CHANGES b/CHANGES
index 401e273ec..6549753ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -51,6 +51,7 @@
 	- no-brainer refcounts for rpmProblemSet object.
 	- header tag sets are per-transactionElement, not per-availablePackage.
 	- no-brainer refcounts for rpmDepSet and rpmFNSet objects.
+	- strip header tags for erased as well as installed transactionElements.
 
 4.0.3 -> 4.0.4:
 
diff --git a/lib/depends.c b/lib/depends.c
index 87a5d5d99..29d7fd384 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -206,14 +206,16 @@ static int intcmp(const void * a, const void * b)	/*@*/
 /**
  * Add removed package instance to ordered transaction set.
  * @param ts		transaction set
+ * @param h		header
  * @param dboffset	rpm database instance
  * @param depends	installed package of pair (or RPMAL_NOMATCH on erase)
  * @return		0 on success
  */
-static int removePackage(rpmTransactionSet ts, int dboffset,
+static int removePackage(rpmTransactionSet ts, Header h, int dboffset,
 		alKey depends)
-	/*@modifies ts @*/
+	/*@modifies ts, h @*/
 {
+    int scareMem = _DS_SCAREMEM;
     transactionElement p;
 
     /* Filter out duplicate erasures. */
@@ -242,13 +244,28 @@ static int removePackage(rpmTransactionSet ts, int dboffset,
     }
 
     p = ts->order + ts->orderCount;
+    ts->orderCount++;
+
     memset(p, 0, sizeof(*p));
+
+    p->NEVR = hGetNEVR(h, NULL);
+    p->name = xstrdup(p->NEVR);
+    if ((p->release = strrchr(p->name, '-')) != NULL)
+	*p->release++ = '\0';
+    if ((p->version = strrchr(p->name, '-')) != NULL)
+	*p->version++ = '\0';
+
+    p->provides = dsNew(h, RPMTAG_PROVIDENAME, scareMem);
+    p->fns = fnsNew(h, RPMTAG_BASENAMES, scareMem);
+    p->requires = dsNew(h, RPMTAG_REQUIRENAME, scareMem);
+    p->conflicts = dsNew(h, RPMTAG_CONFLICTNAME, scareMem);
+    p->obsoletes = dsNew(h, RPMTAG_CONFLICTNAME, scareMem);
+
     p->type = TR_REMOVED;
     p->u.removed.dboffset = dboffset;
     /*@-assignexpose -temptrans@*/
     p->u.removed.dependsOnKey = depends;
     /*@=assignexpose =temptrans@*/
-    ts->orderCount++;
 
     return 0;
 }
@@ -276,11 +293,14 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
     int scareMem = _DS_SCAREMEM;
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     const char * name = NULL;
-    const char * addNVR = hGetNEVR(h, &name);
-    const char * pkgNVR = NULL;
+    char * addNEVR = hGetNEVR(h, &name);
+    char * pkgNEVR = NULL;
+    int isSource;
     int duplicate = 0;
     transactionElement p;
     rpmDepSet provides;
+    rpmDepSet requires;
+    rpmDepSet conflicts;
     rpmDepSet obsoletes;
     rpmFNSet fns;
     alKey pkgKey;	/* addedPackages key */
@@ -316,12 +336,12 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
 	if (ph == NULL)
 	    break;
 
-	pkgNVR = _free(pkgNVR);
+	pkgNEVR = _free(pkgNEVR);
 	pname = NULL;
-	pkgNVR = hGetNEVR(ph, &pname);
+	pkgNEVR = hGetNEVR(ph, &pname);
 
 	if (strcmp(pname, name)) {
-            pkgNVR = _free(pkgNVR);
+            pkgNEVR = _free(pkgNEVR);
             ph = headerFree(ph, "alGetHeader nomatch");
             continue;
 	}
@@ -332,33 +352,41 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
 	if (rc > 0) {
 	    rpmMessage(RPMMESS_WARNING,
 		_("newer package %s already added, skipping %s\n"),
-		pkgNVR, addNVR);
+		pkgNEVR, addNEVR);
 	    goto exit;
 	} else if (rc == 0) {
 	    rpmMessage(RPMMESS_WARNING,
 		_("package %s already added, ignoring\n"),
-		pkgNVR);
+		pkgNEVR);
 	    goto exit;
 	} else {
 	    rpmMessage(RPMMESS_WARNING,
 		_("older package %s already added, replacing with %s\n"),
-		pkgNVR, addNVR);
+		pkgNEVR, addNEVR);
 	    duplicate = 1;
 	}
 	break;
     }
 
+    isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
+
     /*@-branchstate@*/
     if (duplicate) {
 	p = ts->order + i;
-	provides = p->provides;
-	fns = p->fns;
+	provides = rpmdsLink(p->provides, "xfer");
+	p->provides = rpmdsUnlink(p->provides, "xfer");
+	fns = rpmfnsLink(p->fns, "xfer");
+	p->fns = rpmfnsUnlink(p->fns, "xfer");
     } else {
 	provides = dsNew(h, RPMTAG_PROVIDENAME, scareMem);
 	fns = fnsNew(h, RPMTAG_BASENAMES, scareMem);
     }
     /*@=branchstate@*/
 
+    requires = dsNew(h, RPMTAG_REQUIRENAME, scareMem);
+    conflicts = dsNew(h, RPMTAG_CONFLICTNAME, scareMem);
+    obsoletes = dsNew(h, RPMTAG_CONFLICTNAME, scareMem);
+
     /* XXX cast assumes that available keys are indices, not pointers */
     pkgKey = alAddPackage(ts->addedPackages, (alKey)apx, key, h, provides, fns);
     if (pkgKey == RPMAL_NOMATCH) {
@@ -403,13 +431,37 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
   }
 #endif
 
-    p->provides = dsNew(h, RPMTAG_PROVIDENAME, scareMem);
-    p->fns = fnsNew(h, RPMTAG_BASENAMES, scareMem);
-    p->requires = dsNew(h, RPMTAG_REQUIRENAME, scareMem);
+    p->NEVR = xstrdup(addNEVR);
+    p->name = xstrdup(addNEVR);
+    if ((p->release = strrchr(p->name, '-')) != NULL)
+	*p->release++ = '\0';
+    if ((p->version = strrchr(p->name, '-')) != NULL)
+	*p->version++ = '\0';
+
+    p->provides = rpmdsUnlink(p->provides, "xfer");
+    p->provides = rpmdsLink(provides, "xfer");
+    provides = rpmdsUnlink(provides, "xfer");
+
+    p->requires = rpmdsUnlink(p->requires, "xfer");
+    p->requires = rpmdsLink(requires, "xfer");
+    requires = rpmdsUnlink(requires, "xfer");
+
+    p->conflicts = rpmdsUnlink(p->conflicts, "xfer");
+    p->conflicts = rpmdsLink(conflicts, "xfer");
+    conflicts = rpmdsUnlink(conflicts, "xfer");
+
+    p->obsoletes = rpmdsUnlink(p->obsoletes, "xfer");
+    p->obsoletes = rpmdsLink(obsoletes, "xfer");
+    obsoletes = rpmdsUnlink(obsoletes, "xfer");
+
+    p->fns = rpmfnsUnlink(p->fns, "xfer");
+    p->fns = rpmfnsLink(fns, "xfer");
+    fns = rpmfnsUnlink(fns, "xfer");
 
     /*@-assignexpose -ownedtrans @*/
     p->key = key;
     /*@=assignexpose =ownedtrans @*/
+
     /*@-type@*/ /* FIX: cast? */
     p->fd = (fd != NULL ? fdLink(fd, "rpmtransAddPackage") : NULL);
     /*@=type@*/
@@ -441,7 +493,7 @@ assert(apx == ts->numAddedPackages);
 	goto exit;
 
     /* XXX binary rpms always have RPMTAG_SOURCERPM, source rpms do not */
-    if (headerIsEntry(h, RPMTAG_SOURCEPACKAGE))
+    if (isSource)
 	goto exit;
 
     /* Do lazy (readonly?) open of rpm database. */
@@ -453,11 +505,11 @@ assert(apx == ts->numAddedPackages);
     {	rpmdbMatchIterator mi;
 	Header h2;
 
-	mi = rpmtsInitIterator(ts, RPMTAG_NAME, name, 0);
+	mi = rpmtsInitIterator(ts, RPMTAG_NAME, p->name, 0);
 	while((h2 = rpmdbNextIterator(mi)) != NULL) {
 	    /*@-branchstate@*/
 	    if (rpmVersionCompare(h, h2))
-		xx = removePackage(ts, rpmdbGetIteratorOffset(mi), pkgKey);
+		xx = removePackage(ts, h2, rpmdbGetIteratorOffset(mi), pkgKey);
 	    else {
 		uint_32 *pp, multiLibMask = 0, oldmultiLibMask = 0;
 
@@ -476,7 +528,7 @@ assert(apx == ts->numAddedPackages);
 	mi = rpmdbFreeIterator(mi);
     }
 
-    obsoletes = dsiInit(dsNew(h, RPMTAG_OBSOLETENAME, scareMem));
+    obsoletes = dsiInit(rpmdsLink(p->obsoletes, "obsoletes"));
     if (obsoletes != NULL)
     while (dsiNext(obsoletes) >= 0) {
 	const char * Name;
@@ -485,7 +537,7 @@ assert(apx == ts->numAddedPackages);
 	    continue;	/* XXX can't happen */
 
 	/* XXX avoid self-obsoleting packages. */
-	if (!strcmp(name, Name))
+	if (!strcmp(p->name, Name))
 		continue;
 
 	{   rpmdbMatchIterator mi;
@@ -504,21 +556,19 @@ assert(apx == ts->numAddedPackages);
 		/*@-branchstate@*/
 		if (dsiGetEVR(obsoletes) == NULL
 		 || headerMatchesDepFlags(h2, obsoletes))
-		    xx = removePackage(ts, rpmdbGetIteratorOffset(mi), pkgKey);
+		    xx = removePackage(ts, h2, rpmdbGetIteratorOffset(mi), pkgKey);
 		/*@=branchstate@*/
 	    }
 	    mi = rpmdbFreeIterator(mi);
 	}
     }
-    /*@=nullstate@*/ /* FIX: obsoletes->EVR may be NULL */
     obsoletes = dsFree(obsoletes);
-    /*@=nullstate@*/
 
     ec = 0;
 
 exit:
-    pkgNVR = _free(pkgNVR);
-    addNVR = _free(addNVR);
+    pkgNEVR = _free(pkgNEVR);
+    addNEVR = _free(addNEVR);
     return ec;
 }
 
@@ -531,11 +581,13 @@ void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, fnpyKey key)
     /* XXX FIXME: return code RPMAL_NOMATCH is error */
     (void) alAddPackage(ts->availablePackages, RPMAL_NOMATCH, key, h,
 		provides, fns);
+    fns = fnsFree(fns);
+    provides = dsFree(provides);
 }
 
-int rpmtransRemovePackage(rpmTransactionSet ts, int dboffset)
+int rpmtransRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
 {
-    return removePackage(ts, dboffset, RPMAL_NOMATCH);
+    return removePackage(ts, h, dboffset, RPMAL_NOMATCH);
 }
 
 /*@-nullstate@*/ /* FIX: better annotations */
@@ -562,7 +614,7 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
 	    return NULL;
 
 	pi = teInitIterator(ts);
-	while ((p = teNext(pi, TR_ADDED)) != NULL) {
+	while ((p = teNextIterator(pi)) != NULL) {
 	    rpmRelocation * r;
 	    if (p->relocs) {
 		for (r = p->relocs; (r->oldPath || r->newPath); r++) {
@@ -571,14 +623,20 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
 		}
 		p->relocs = _free(p->relocs);
 	    }
+
 	    p->provides = dsFree(p->provides);
 	    p->requires = dsFree(p->requires);
+	    p->conflicts = dsFree(p->conflicts);
+	    p->obsoletes = dsFree(p->obsoletes);
 	    p->fns = fnsFree(p->fns);
 
 	    /*@-type@*/ /* FIX: cast? */
 	    if (p->fd != NULL)
 	        p->fd = fdFree(p->fd, "alAddPackage (rpmtransFree)");
 	    /*@=type@*/
+
+	    p->NEVR = _free(p->NEVR);
+	    p->name = _free(p->name);
 	}
 	pi = teFreeIterator(pi);
 
@@ -1347,10 +1405,10 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo
 
 	p->tsi = xcalloc(1, sizeof(*p->tsi));
 
+#ifdef	DYING
 	/* Retrieve info from addedPackages. */
 	p->NEVR = alGetNVR(ts->addedPackages, p->u.addedKey);
 	p->name = alGetNVR(ts->addedPackages, p->u.addedKey);
-/*@-nullpass@*/
 	if ((p->release = strrchr(p->name, '-')) != NULL)
 	    *p->release++ = '\0';
 	if ((p->version = strrchr(p->name, '-')) != NULL)
@@ -1358,7 +1416,7 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo
 /*@-modfilesystem@*/
 prtTSI(p->NEVR, p->tsi);
 /*@=modfilesystem@*/
-/*@=nullpass@*/
+#endif
     }
     pi = teFreeIterator(pi);
 
@@ -1636,8 +1694,10 @@ prtTSI(" p", p->tsi);
 	    tsi = _free(tsi);
 	}
 	p->tsi = _free(p->tsi);
+#ifdef	DYING
 	p->NEVR = _free(p->NEVR);
 	p->name = _free(p->name);
+#endif
 
 	/* Prepare added package ordering permutation. */
 	orderList[j].pkgKey = p->u.addedKey;
diff --git a/lib/depends.h b/lib/depends.h
index d4b4c6c1a..7e0c7d4fe 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -90,6 +90,10 @@ struct transactionElement_s {
 /*@refcounted@*/ /*@null@*/
     rpmDepSet requires;		/*!< Requires: dependencies. */
 /*@refcounted@*/ /*@null@*/
+    rpmDepSet conflicts;	/*!< Conflicts: dependencies. */
+/*@refcounted@*/ /*@null@*/
+    rpmDepSet obsoletes;	/*!< Obsoletes: dependencies. */
+/*@refcounted@*/ /*@null@*/
     rpmFNSet fns;		/*!< File info set. */
 
     uint_32 multiLib;	/* (TR_ADDED) MULTILIB */
diff --git a/lib/psm.h b/lib/psm.h
index f5ad3ff19..85f9e596b 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -32,23 +32,6 @@ struct transactionFileInfo_s {
 /*@owned@*/ const char * version; /*!< Version: tag (malloc'd). */
 /*@owned@*/ const char * release; /*!< Release: tag (malloc'd). */
 
-#ifdef	NOTYET
-/*@owned@*/ const char ** provides;	/*!< Provides: name strings. */
-/*@owned@*/ const char ** providesEVR;	/*!< Provides: [epoch:]version[-release] strings. */
-/*@dependent@*/ int * provideFlags;	/*!< Provides: logical range qualifiers. */
-/*@owned@*//*@null@*/ const char ** requires;	/*!< Requires: name strings. */
-/*@owned@*//*@null@*/ const char ** requiresEVR;/*!< Requires: [epoch:]version[-release] strings. */
-/*@dependent@*//*@null@*/ int * requireFlags;	/*!< Requires: logical range qualifiers. */
-/*@owned@*//*@null@*/ const char ** baseNames;	/*!< Header file basenames. */
-/*@dependent@*//*@null@*/ int_32 * epoch;	/*!< Header epoch (if any). */
-    int providesCount;			/*!< No. of Provide:'s in header. */
-    int requiresCount;			/*!< No. of Require:'s in header. */
-    int filesCount;			/*!< No. of files in header. */
-    int npreds;				/*!< No. of predecessors. */
-    int depth;				/*!< Max. depth in dependency tree. */
-    struct tsortInfo_s tsi;		/*!< Dependency tsort data. */
-#endif
-
     uint_32 multiLib;		/* MULTILIB */
 /*@null@*/
     fnpyKey key;		/*!< Package notify key. */
@@ -71,26 +54,33 @@ struct transactionFileInfo_s {
     HFD_t hfd;			/*!< Vector to headerFreeData() */
     int_32 epoch;
     uint_32 flags;		/*!< File flag default. */
-    const uint_32 * fflags;	/*!< File flag(s) (from header) */
-    const uint_32 * fsizes;	/*!< File size(s) (from header) */
-    const uint_32 * fmtimes;	/*!< File modification time(s) (from header) */
+
 /*@owned@*/ const char ** bnl;	/*!< Base name(s) (from header) */
 /*@owned@*/ const char ** dnl;	/*!< Directory name(s) (from header) */
-    int_32 * dil;		/*!< Directory indice(s) (from header) */
-/*@owned@*/ const char ** obnl;	/*!< Original base name(s) (from header) */
-/*@owned@*/ const char ** odnl;	/*!< Original directory name(s) (from header) */
-/*@unused@*/ int_32 * odil;	/*!< Original directory indice(s) (from header) */
 /*@owned@*/ const char ** fmd5s;/*!< File MD5 sum(s) (from header) */
 /*@owned@*/ const char ** flinks;	/*!< File link(s) (from header) */
+/*@owned@*/ const char ** flangs;	/*!< File lang(s) */
+    int_32 * dil;		/*!< Directory indice(s) (from header) */
+    const uint_32 * fflags;	/*!< File flag(s) (from header) */
+    const uint_32 * fsizes;	/*!< File size(s) (from header) */
+    const uint_32 * fmtimes;	/*!< File modification time(s) (from header) */
 /* XXX setuid/setgid bits are turned off if fuser/fgroup doesn't map. */
     uint_16 * fmodes;		/*!< File mode(s) (from header) */
     uint_16 * frdevs;		/*!< File rdev(s) (from header) */
-/*@only@*/ /*@null@*/ char * fstates;	/*!< File state(s) (from header) */
+
 /*@owned@*/ const char ** fuser;	/*!< File owner(s) */
 /*@owned@*/ const char ** fgroup;	/*!< File group(s) */
-/*@owned@*/ const char ** flangs;	/*!< File lang(s) */
+/*@owned@*/ /*@null@*/ uid_t * fuids;	/*!< File uid(s) */
+/*@owned@*/ /*@null@*/ gid_t * fgids;	/*!< File gid(s) */
+
+/*@only@*/ /*@null@*/ char * fstates;	/*!< File state(s) (from header) */
+
     int fc;			/*!< No. of files. */
     int dc;			/*!< No. of directories. */
+
+/*@owned@*/ const char ** obnl;	/*!< Original base name(s) (from header) */
+/*@owned@*/ const char ** odnl;	/*!< Original directory name(s) (from header) */
+/*@unused@*/ int_32 * odil;	/*!< Original directory indice(s) (from header) */
     int bnlmax;			/*!< Length (in bytes) of longest base name. */
     int dnlmax;			/*!< Length (in bytes) of longest dir name. */
     int astriplen;
@@ -102,21 +92,20 @@ struct transactionFileInfo_s {
     int mapflags;
 /*@owned@*/ /*@null@*/ int * fmapflags;
     uid_t uid;
-/*@owned@*/ /*@null@*/ uid_t * fuids;	/*!< File uid(s) */
     gid_t gid;
-/*@owned@*/ /*@null@*/ gid_t * fgids;	/*!< File gid(s) */
     int magic;
 
 #define	TFIMAGIC	0x09697923
 /*@owned@*/ FSM_t fsm;		/*!< File state machine data. */
 
     int keep_header;		/*!< Keep header? */
-/*@refs@*/ int nrefs;		/*!< Reference count. */
 
 /*@owned@*/ struct sharedFileInfo * replaced;	/*!< (TR_ADDED) */
 /*@owned@*/ uint_32 * replacedSizes;	/*!< (TR_ADDED) */
 
     unsigned int record;	/*!< (TR_REMOVED) */
+
+/*@refs@*/ int nrefs;		/*!< Reference count. */
 };
 
 /**
diff --git a/lib/rpmal.c b/lib/rpmal.c
index 3bb558479..0bd8a62f0 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -197,6 +197,7 @@ Header alGetHeader(availableList al, alKey pkgKey, int unlink)
     return h;
 }
 
+#ifdef	DYING
 char * alGetNVR(const availableList al, alKey pkgKey)
 {
     availablePackage alp = alGetPkg(al, pkgKey);
@@ -216,6 +217,7 @@ char * alGetNVR(const availableList al, alKey pkgKey)
     }
     return pkgNVR;
 }
+#endif
 
 availableList alCreate(int delta)
 {
diff --git a/lib/rpmal.h b/lib/rpmal.h
index 183042780..df790c274 100644
--- a/lib/rpmal.h
+++ b/lib/rpmal.h
@@ -42,6 +42,7 @@ availablePackage alGetPkg(/*@null@*/ availableList al, /*@null@*/ alKey pkgKey)
 	/*@*/;
 /*@=exportlocal@*/
 
+#ifdef	DYING
 /**
  * Return (malloc'd) available package name-version-release string.
  * @param al		available list
@@ -51,6 +52,7 @@ availablePackage alGetPkg(/*@null@*/ availableList al, /*@null@*/ alKey pkgKey)
 /*@only@*/ /*@null@*/
 char * alGetNVR(/*@null@*/const availableList al, /*@null@*/ alKey pkgKey)
 	/*@*/;
+#endif
 
 /**
  * Initialize available packckages, items, and directory list.
diff --git a/lib/rpmds.c b/lib/rpmds.c
index db42fba42..dcdd96032 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -80,6 +80,11 @@ fprintf(stderr, "*** fns %p -- %s[%d]\n", fns, fns->Type, fns->fc);
 	fns->flangs = hfd(fns->flangs, -1);
 	fns->fmd5s = hfd(fns->fmd5s, -1);
 
+	fns->fuser = hfd(fns->fuser, -1);
+	fns->fuids = _free(fns->fuids);
+	fns->fgroup = hfd(fns->fgroup, -1);
+	fns->fgids = _free(fns->fgids);
+
 	fns->fstates = _free(fns->fstates);
 
 	/*@-evalorder@*/
@@ -152,8 +157,14 @@ rpmFNSet fnsNew(Header h, rpmTag tagN, int scareMem)
 	xx = hge(h, RPMTAG_FILERDEVS, NULL, (void **) &fns->frdevs, NULL);
 	xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &fns->dil, NULL);
 
+	xx = hge(h, RPMTAG_FILEUSERNAME, NULL, (void **) &fns->fuser, NULL);
+	fns->fuids = NULL;
+	xx = hge(h, RPMTAG_FILEGROUPNAME, NULL, (void **) &fns->fgroup, NULL);
+	fns->fgids = NULL;
+
 	xx = hge(h, RPMTAG_FILESTATES, NULL, (void **) &fns->fstates, NULL);
 	_fdupe(fns, fstates);
+
 	if (xx == 0 || fns->fstates == NULL)
 	    fns->fstates = xcalloc(fns->fc, sizeof(*fns->fstates));
 
diff --git a/lib/rpmds.h b/lib/rpmds.h
index 7fd4f1086..1ca9aa1f2 100644
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -45,6 +45,15 @@ struct rpmFNSet_s {
     const uint_16 * frdevs;	/*!< File rdev(s) (from header) */
 
 /*@only@*/ /*@null@*/
+    const char ** fuser;	/*!< File owner(s) */
+/*@only@*/ /*@null@*/
+    const char ** fgroup;	/*!< File group(s) */
+/*@only@*/ /*@null@*/
+    uid_t * fuids;		/*!< File uid(s) */
+/*@only@*/ /*@null@*/
+    gid_t * fgids;		/*!< File gid(s) */
+
+/*@only@*/ /*@null@*/
     char * fstates;		/*!< File state(s) (from header) */
 
     int_32 dc;			/*!< No. of directories. */
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 5887c9887..9bd844bec 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -636,7 +636,7 @@ int rpmErase(rpmTransactionSet ts, const char ** argv,
 	    while ((h = rpmdbNextIterator(mi)) != NULL) {
 		unsigned int recOffset = rpmdbGetIteratorOffset(mi);
 		if (recOffset) {
-		    (void) rpmtransRemovePackage(ts, recOffset);
+		    (void) rpmtransRemovePackage(ts, h, recOffset);
 		    numPackages++;
 		}
 	    }
@@ -799,7 +799,7 @@ IDTX IDTXload(rpmTransactionSet ts, rpmTag tag)
 	    /*@-nullderef@*/
 	    idt = idtx->idt + idtx->nidt;
 	    /*@=nullderef@*/
-	    idt->h = NULL;
+	    idt->h = headerLink(h, "IDTXload idt->h");
 	    idt->key = NULL;
 	    idt->instance = rpmdbGetIteratorOffset(mi);
 	    idt->val.i32 = *tidp;
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index b2c83095d..8cb5d5196 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -1410,7 +1410,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag,
 	/*@modifies db @*/;
 
 /** \ingroup rpmtrans
- * Add package to be installed to unordered transaction set.
+ * Add package to be installed to transaction set.
  *
  * If fd is NULL, the callback specified in rpmtransCreateSet() is used to
  * open and close the file descriptor. If Header is NULL, the fd is always
@@ -1444,13 +1444,14 @@ void rpmtransAvailablePackage(rpmTransactionSet ts, Header h,
 	/*@modifies h, ts @*/;
 
 /** \ingroup rpmtrans
- * Add package to be removed to unordered transaction set.
+ * Add package to be erased to transaction set.
  * @param ts		transaction set
+ * @param h		header
  * @param dboffset	rpm database instance
  * @return		0 on success
  */
-int rpmtransRemovePackage(rpmTransactionSet ts, int dboffset)
-	/*@modifies ts @*/;
+int rpmtransRemovePackage(rpmTransactionSet ts, Header h, int dboffset)
+	/*@modifies ts, h @*/;
 
 /** \ingroup rpmtrans
  * Re-create an empty transaction set.
diff --git a/po/cs.po b/po/cs.po
index b37f269c2..be521bd4f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -1437,94 +1437,94 @@ msgstr "selhal - "
 msgid "cannot open Packages database in %s\n"
 msgstr "nemohu otevøít databázi balíèkù v %s\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "balíèek %s je ji¾ nainstalován"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "¹patnı db soubor %s\n"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "¾ádné balíèky\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr "NE "
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr "ANO"
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr "========== ukládání tsort relací\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n"
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n"
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr "SMYÈKA:\n"
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr "========== pokraèuje tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2458,12 +2458,12 @@ msgstr "záznam %d nelze pøeèíst\n"
 msgid "package %s is not installed\n"
 msgstr "balíèek %s není nainstalován\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "¹patnı db soubor %s\n"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
@@ -2532,7 +2532,7 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2541,13 +2541,13 @@ msgstr ""
 "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n"
diff --git a/po/da.po b/po/da.po
index 97cac87a8..0b6f2bc2b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -1438,94 +1438,94 @@ msgstr " mislykkedes - "
 msgid "cannot open Packages database in %s\n"
 msgstr "kunne ikke åbne Packages-database i %s\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s JA (rpmrc tilfører)\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s JA (rpmlib tilfører)\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s JA (db tilfører)\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "ingen pakker\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr "========== gemmer tsort-relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n"
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr "LØKKE:\n"
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsætter tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2479,12 +2479,12 @@ msgstr "post %d kunne ikke læses\n"
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db tilfører)\n"
@@ -2553,7 +2553,7 @@ msgid "OK"
 msgstr "O.K."
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2562,13 +2562,13 @@ msgstr ""
 "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
diff --git a/po/de.po b/po/de.po
index 0b7731cfc..1744df975 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -1573,95 +1573,95 @@ msgstr "pgp fehlgeschlagen"
 msgid "cannot open Packages database in %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
 # , c-format
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
 # FIXME
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2661,12 +2661,12 @@ msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
 
 # , c-format
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
@@ -2737,20 +2737,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
diff --git a/po/en_RN.po b/po/en_RN.po
index 08273b247..d831683e4 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 08273b247..d831683e4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 08273b247..d831683e4 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 7df4d3ebd..347289efa 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1456,93 +1456,93 @@ msgstr "pgp epäonnistui"
 msgid "cannot open Packages database in %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "en voinut avata %s: %s"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "kysele kaikki paketit"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2515,12 +2515,12 @@ msgstr "tietuetta %d ei voitu lukea\n"
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
@@ -2591,20 +2591,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
diff --git a/po/fr.po b/po/fr.po
index 4b60a9610..175f33f68 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1496,90 +1496,90 @@ msgstr "La construction a chou.\n"
 msgid "cannot open Packages database in %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2564,12 +2564,12 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2638,20 +2638,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
diff --git a/po/gl.po b/po/gl.po
index 16ca37b12..a7794865f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -1410,88 +1410,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2406,11 +2406,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2478,20 +2478,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 08273b247..d831683e4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 08273b247..d831683e4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 2ba603f28..d9383aa93 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -1415,89 +1415,89 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr "get ekki opnağ pakka gagnagrunn í\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "uppfæra pakka"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2417,11 +2417,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2489,20 +2489,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 08273b247..d831683e4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index b1049a954..dce72613e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -1488,93 +1488,93 @@ msgstr "¼ºÇÔ - "
 msgid "cannot open Packages database in %s\n"
 msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2574,12 +2574,12 @@ msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿\n"
 msgid "package %s is not installed\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
@@ -2650,7 +2650,7 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2659,13 +2659,13 @@ msgstr ""
 "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Ş¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
diff --git a/po/ko.po b/po/ko.po
index f1c746039..2ef98ad5a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -1428,94 +1428,94 @@ msgstr " ½ÇÆĞÇÔ - "
 msgid "cannot open Packages database in %s\n"
 msgstr "%s ¾ÈÀÇ ÆĞÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "À߸øµÈ db ÆÄÀÏ    %s\n"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr "¾Æ´Ï¿À"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr "¿¹"
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ÆĞÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n"
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n"
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr "·çÇÁ(LOOP):\n"
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2464,12 +2464,12 @@ msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n"
 msgid "package %s is not installed\n"
 msgstr "%s ÆĞÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "À߸øµÈ db ÆÄÀÏ    %s\n"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
@@ -2538,7 +2538,7 @@ msgid "OK"
 msgstr "È®ÀÎ"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2547,13 +2547,13 @@ msgstr ""
 "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
diff --git a/po/no.po b/po/no.po
index e6e53e159..2d43a77d8 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -1429,89 +1429,89 @@ msgstr " feilet - "
 msgid "cannot open Packages database in %s\n"
 msgstr "kan ikke åpne pakkedatabase i %s\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakke %s er allerede installert"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "ingen pakker\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr "NEI"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2441,11 +2441,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2513,20 +2513,20 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 482dadb51..a22226626 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1470,94 +1470,94 @@ msgstr " nie powiod³o siê -"
 msgid "cannot open Packages database in %s\n"
 msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "b³êdny status pliku: %s"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "Udostêpniane zasoby:"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 #, fuzzy
 msgid "NO "
 msgstr "NIE DOBRZE"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2531,12 +2531,12 @@ msgstr "nie mo¿na odczytaæ rekordu %d\n"
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "b³êdny status pliku: %s"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "Udostêpniane zasoby:"
@@ -2606,20 +2606,20 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, fuzzy, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "       rpm {--version}"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
diff --git a/po/pt.po b/po/pt.po
index 0eb4a8df5..18ffc44e1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -1425,94 +1425,94 @@ msgstr " falhou - "
 msgid "cannot open Packages database in %s\n"
 msgstr "não consigo abrir a base de dados Packages em %s\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "o pacote %s já está instalado"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "ficheiro db inválido %s\n"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "nenhum pacote\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) adicionado à cache de dependências.\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 #, fuzzy
 msgid "NO "
 msgstr "NÃO-OK"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr "=========== a guardar as relações do tsort\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr "========== só os sucessores (ordem de apresentação)\n"
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr "CICLO:\n"
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr "========== a prosseguir o tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2455,12 +2455,12 @@ msgstr "o registo %d não pôde ser lido\n"
 msgid "package %s is not installed\n"
 msgstr "o pacote %s não está instalado\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "ficheiro db inválido %s\n"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
@@ -2529,7 +2529,7 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2538,13 +2538,13 @@ msgstr ""
 "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n"
 "\t %s\tB %s\n"
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 50f86ad13..a4b3037f0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 
 #: build.c:36
 #, fuzzy
@@ -1583,92 +1583,92 @@ msgstr "Construo falhou.\n"
 msgid "cannot open Packages database in %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
 # , c-format
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "pesquise todos os pacotes"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
 # , c-format
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "No consegui abrir: %s\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2684,12 +2684,12 @@ msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
 
 # , c-format
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2761,20 +2761,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "no foi passado pacote para instalao"
diff --git a/po/ro.po b/po/ro.po
index 3e481370b..92d8ee602 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -1410,88 +1410,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2406,11 +2406,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2478,20 +2478,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 9dec73a68..ff1f7f8c1 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index c9976295e..2bd25d580 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -1446,95 +1446,95 @@ msgstr "ÎÅ ÕÄÁÌÏÓØ - "
 msgid "cannot open Packages database in %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s YES (rpmrc provides)\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s YES (rpmlib provides)\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "ÎÅÔ ĞÁËÅÔÏ×\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr "îåT"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr "äá"
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr "========== ÚÁĞÉÓØ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ÓÏÒÔÉÒÏ×ËÁ ĞÁËÅÔÏ× (ÏŞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, "
 "ÇÌÕÂÉÎÁ)\n"
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÔÏÌØËÏ ĞÏÓÌÅÄÏ×ÁÔÅÌÉ (× ĞÏÒÑÄËÅ ĞÒÅÄÓÔÁ×ÌÅÎÉÑ)\n"
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr "ãéëì:\n"
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr "========== ĞÒÏÄÏÌÖÅÎÉÅ ÕĞÏÒÑÄÏŞÅÎÉÑ ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2471,12 +2471,12 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÚÁĞÉÓØ %u\n"
 msgid "package %s is not installed\n"
 msgstr "ĞÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s YES (db provides)\n"
@@ -2545,7 +2545,7 @@ msgid "OK"
 msgstr "Oë"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2554,13 +2554,13 @@ msgstr ""
 "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
diff --git a/po/sk.po b/po/sk.po
index d5a3b4560..056eb5d80 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -1469,94 +1469,94 @@ msgstr " zlyhalo - "
 msgid "cannot open Packages database in %s\n"
 msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "chybnı stav súboru: %s"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "Poskytuje:"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "nájdenıch %d balíkov\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstraòuje sa index skupín\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2528,12 +2528,12 @@ msgstr "záznam %d nie je mo¾né preèíta»\n"
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "chybnı stav súboru: %s"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "Poskytuje:"
@@ -2603,20 +2603,20 @@ msgid "OK"
 msgstr "V PORIADKU"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, fuzzy, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "          rpm {--version}"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
diff --git a/po/sl.po b/po/sl.po
index d597a22e1..998910d98 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.197 2001/11/09 23:13:58 jbj Exp $
+# $Id: sl.po,v 1.198 2001/11/10 01:40:13 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1470,94 +1470,94 @@ msgstr " neuspe¹no - "
 msgid "cannot open Packages database in %s\n"
 msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s-%s-%s je ¾e name¹èen"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "po¹kodovana zbirka podatkov %s"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "ni paketov\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2527,12 +2527,12 @@ msgstr "zapisa %d ni mo¾no prebrati\n"
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name¹èen\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "po¹kodovana zbirka podatkov %s"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s DA (db ponudbe)\n"
@@ -2601,7 +2601,7 @@ msgid "OK"
 msgstr "V REDU"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2610,13 +2610,13 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
diff --git a/po/sr.po b/po/sr.po
index c33164e17..cdc81e605 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -1454,93 +1454,93 @@ msgstr "PGP omanuo"
 msgid "cannot open Packages database in %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "upit nad svim paketima"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2514,12 +2514,12 @@ msgstr "ne mogu da proèitam slog %d\n"
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
@@ -2590,20 +2590,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s nije naveden u %s"
diff --git a/po/sv.po b/po/sv.po
index f16b16e81..7de438071 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1431,94 +1431,94 @@ msgstr " misslyckades - "
 msgid "cannot open Packages database in %s\n"
 msgstr "kan inte öppna paketdatabas i %s\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s är redan installerat"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "felaktig db-fil %s\n"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s JA (db-tillhandahållande)\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "inga paket\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr "========== noterar alla relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n"
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr "========== endast efterföljare (presentationsordning)\n"
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsätter med tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2455,12 +2455,12 @@ msgstr "post %u kunde inte läsas\n"
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "felaktig db-fil %s\n"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db-tillhandahållande)\n"
@@ -2529,7 +2529,7 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2538,13 +2538,13 @@ msgstr ""
 "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
diff --git a/po/tr.po b/po/tr.po
index c90c18812..398bf4190 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -1451,94 +1451,94 @@ msgstr " başarısız - "
 msgid "cannot open Packages database in %s\n"
 msgstr "%s de Paket veritabanı açılamadı\n"
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "%s zaten kurulu"
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s EVET (rpmrc sağlar)\n"
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s EVET (rpmlib sağlar)\n"
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 #, fuzzy
 msgid "(db files)"
 msgstr "db dosyası %s hatalı\n"
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s EVET (db sağlar)\n"
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 #, fuzzy
 msgid "(db package)"
 msgstr "paket yok\n"
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, fuzzy, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) Bağımlılar alanına eklendi.\n"
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr "EVET"
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort bağıntılarından %s-%s-%s \"%s\" kaldırılıyor\n"
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort bağıntıları kaydediliyor\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== paketler tsort'lanıyor (sıra, #öncüller, #ardıllar, derinlik)\n"
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr "========== sadece ardıllar (sunum sırası)\n"
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr "ÇEVRİM:\n"
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort sürüyor ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2478,12 +2478,12 @@ msgstr "%u. kayıt okunamadı\n"
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu değil\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 #, fuzzy
 msgid "(added files)"
 msgstr "db dosyası %s hatalı\n"
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s EVET (db sağlar)\n"
@@ -2552,7 +2552,7 @@ msgid "OK"
 msgstr "Tamam"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, fuzzy, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2561,13 +2561,13 @@ msgstr ""
 "\"B\" bağımlılığı bir dönemsellik gerektirir (tabii ki \"A\" da)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n"
diff --git a/po/uk.po b/po/uk.po
index 08273b247..d831683e4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 08273b247..d831683e4 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 08273b247..d831683e4 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 08273b247..d831683e4 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-09 17:39-0500\n"
+"POT-Creation-Date: 2001-11-09 20:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1415,88 +1415,88 @@ msgstr ""
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:334
+#: lib/depends.c:354
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:339
+#: lib/depends.c:359
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:344
+#: lib/depends.c:364
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:658
+#: lib/depends.c:716
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:683
+#: lib/depends.c:741
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:699
+#: lib/depends.c:757
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:720
+#: lib/depends.c:778
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:732
+#: lib/depends.c:790
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:745
+#: lib/depends.c:803
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:784
+#: lib/depends.c:842
 #, c-format
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:786 lib/rpmds.c:457 lib/rpmds.c:614
+#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:1120
+#: lib/depends.c:1178
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1366
+#: lib/depends.c:1424
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1439
+#: lib/depends.c:1497
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1514
+#: lib/depends.c:1572
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1575
+#: lib/depends.c:1633
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1610
+#: lib/depends.c:1668
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1615
+#: lib/depends.c:1673
 #, c-format
 msgid "rpmdepOrder failed, %d elements remain\n"
 msgstr ""
@@ -2411,11 +2411,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:695
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:792
+#: lib/rpmal.c:794
 msgid "(added provide)"
 msgstr ""
 
@@ -2483,20 +2483,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:595
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:613
+#: lib/rpmds.c:624
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:638
+#: lib/rpmds.c:649
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 8f031d791..b4b63f551 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -1343,7 +1343,7 @@ static PyObject * rpmtransRemove(rpmtransObject * s, PyObject * args) {
         while ((h = rpmdbNextIterator(mi)) != NULL) {
 	    unsigned int recOffset = rpmdbGetIteratorOffset(mi);
 	    if (recOffset) {
-	        rpmtransRemovePackage(s->ts, recOffset);
+	        rpmtransRemovePackage(s->ts, h, recOffset);
 	    }
 	}
     }
diff --git a/rpm.spec b/rpm.spec
index f7181ef4f..32fd1e1ca 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -569,3 +569,4 @@ fi
 - no-brainer refcounts for rpmProblemSet object.
 - header tag sets are per-transactionElement, not per-availablePackage.
 - no-brainer refcounts for rpmDepSet and rpmFNSet objects.
+- strip header tags for erased as well as installed transactionElements.
diff --git a/rpm.spec.in b/rpm.spec.in
index 037e10141..bc63d342f 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -569,3 +569,4 @@ fi
 - no-brainer refcounts for rpmProblemSet object.
 - header tag sets are per-transactionElement, not per-availablePackage.
 - no-brainer refcounts for rpmDepSet and rpmFNSet objects.
+- strip header tags for erased as well as installed transactionElements.