RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 21-Jun-2013 23:29:10 Branch: rpm-5_4 Handle: 2013062121291000 Modified files: (Branch: rpm-5_4) rpm/tools dbconvert.c Log: - remove duplicate test. Summary: Revision Changes Path 2.1.2.16 +1 -1 rpm/tools/dbconvert.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/tools/dbconvert.c ============================================================================ $ cvs diff -u -r2.1.2.15 -r2.1.2.16 dbconvert.c --- rpm/tools/dbconvert.c 5 May 2012 18:15:00 -0000 2.1.2.15 +++ rpm/tools/dbconvert.c 21 Jun 2013 21:29:10 -0000 2.1.2.16 @@ -109,7 +109,7 @@ Globfree(&gl); tsCur = rpmtsCreate(); - rpmtsSetRootDir(tsCur, prefix && prefix && prefix[0] ? prefix : NULL); + rpmtsSetRootDir(tsCur, prefix && prefix[0] ? prefix : NULL); if(!rpmtsOpenDB(tsCur, O_RDONLY)) { if(dbtype == 1) { addMacro(NULL, "_dbi_tags", NULL, "Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Depends:Pubkeys", -1); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org