RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 30-Jul-2007 05:07:59 Branch: rpm-4_5 Handle: 2007073004075800 Modified files: (Branch: rpm-4_5) rpm CHANGES rpmqv.c rpm/lib rpmcli.h rpm/rpmdb poptDB.c Log: - jbj: eliminate --initdb. Summary: Revision Changes Path 1.1360.2.29 +1 -0 rpm/CHANGES 2.67.2.1 +0 -1 rpm/lib/rpmcli.h 1.6.2.1 +0 -2 rpm/rpmdb/poptDB.c 1.113.2.2 +0 -6 rpm/rpmqv.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.1360.2.28 -r1.1360.2.29 CHANGES --- rpm/CHANGES 30 Jul 2007 03:03:31 -0000 1.1360.2.28 +++ rpm/CHANGES 30 Jul 2007 03:07:58 -0000 1.1360.2.29 @@ -1,4 +1,5 @@ 4.4.9 -> 4.5: + - jbj: eliminate --initdb. - jbj: eliminate --rsegfault/--wsegfault. - jbj: add RPMTAG_DBINSTANCE header extension. - jbj: parameterize Depends index and dependency result caching. @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmcli.h ============================================================================ $ cvs diff -u -r2.67 -r2.67.2.1 rpmcli.h --- rpm/lib/rpmcli.h 25 May 2007 17:36:02 -0000 2.67 +++ rpm/lib/rpmcli.h 30 Jul 2007 03:07:58 -0000 2.67.2.1 @@ -775,7 +775,6 @@ rpmRelocation relocations; /* database mode arguments */ - int init; /*!< from --initdb */ int rebuild; /*!< from --rebuilddb */ int verify; /*!< from --verifydb */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/poptDB.c ============================================================================ $ cvs diff -u -r1.6 -r1.6.2.1 poptDB.c --- rpm/rpmdb/poptDB.c 25 May 2007 17:36:33 -0000 1.6 +++ rpm/rpmdb/poptDB.c 30 Jul 2007 03:07:58 -0000 1.6.2.1 @@ -14,8 +14,6 @@ /** */ struct poptOption rpmDatabasePoptTable[] = { - { "initdb", '\0', POPT_ARG_VAL, &rpmDBArgs.init, 1, - N_("initialize database"), NULL}, { "rebuilddb", '\0', POPT_ARG_VAL, &rpmDBArgs.rebuild, 1, N_("rebuild database inverted lists from installed package headers"), NULL}, @@ . patch -p0 <<'@@ .' Index: rpm/rpmqv.c ============================================================================ $ cvs diff -u -r1.113.2.1 -r1.113.2.2 rpmqv.c --- rpm/rpmqv.c 5 Jun 2007 22:48:08 -0000 1.113.2.1 +++ rpm/rpmqv.c 30 Jul 2007 03:07:58 -0000 1.113.2.2 @@ -290,12 +290,6 @@ #ifdef IAM_RPMDB if (bigMode == MODE_UNKNOWN || (bigMode & MODES_DB)) { - if (da->init) { - if (bigMode != MODE_UNKNOWN) - argerror(_("only one major mode may be specified")); - else - bigMode = MODE_INITDB; - } else if (da->rebuild) { if (bigMode != MODE_UNKNOWN) argerror(_("only one major mode may be specified")); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org