- include RPM-GPG-KEY in file manifest.

- simplify --last popt alias, date like -qi (bjerrick@easystreet.com).
- fix: alloca'd memory used outside of scope (alpha segfault).

CVS patchset: 3723
CVS date: 2000/05/10 15:36:29

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/db3.c b/lib/db3.c
index a3ff66672..3279c516f 100644
--- a/lib/db3.c
+++ b/lib/db3.c
@@ -915,7 +915,6 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
     const char * dbhome;
     const char * dbfile;
     const char * dbsubfile;
-    const char * dbpath;
     extern struct _dbiVec db3vec;
     dbiIndex dbi = NULL;
     int rc = 0;
@@ -1031,6 +1030,7 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 	    dbi->dbi_dbinfo = NULL;
 
 	    {	const char * dbfullpath;
+		const char * dbpath;
 		char * t;
 		int nb;
 
@@ -1043,10 +1043,11 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 		    t = stpcpy( stpcpy( t, "/"), dbfile);
 		dbpath = (!dbi->dbi_use_dbenv && !dbi->dbi_temporary)
 			? dbfullpath : dbfile;
-	    }
 
-	    rc = db->open(db, dbpath, dbsubfile,
+		rc = db->open(db, dbpath, dbsubfile,
 		    dbi->dbi_type, oflags, dbi->dbi_perms);
+	    }
+
 	    /* XXX return rc == errno without printing */
 	    _printit = (rc > 0 ? 0 : _debug);
 	    xx = cvtdberr(dbi, "db->open", rc, _printit);