projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| f6627787 ER |
1 | Index: rpm/lib/rpmcli.h |
| 2 | RCS File: /v/rpm/cvs/rpm/lib/rpmcli.h,v | |
| 3 | rcsdiff -q -kk '-r2.67' '-r2.67.2.1' -u '/v/rpm/cvs/rpm/lib/rpmcli.h,v' 2>/dev/null | |
| 4 | --- rpmcli.h 2007/05/25 17:36:02 2.67 | |
| 5 | +++ rpmcli.h 2007/07/30 03:07:58 2.67.2.1 | |
| 6 | @@ -775,7 +775,6 @@ | |
| 7 | rpmRelocation relocations; | |
| 8 | ||
| 9 | /* database mode arguments */ | |
| 10 | - int init; /*!< from --initdb */ | |
| 11 | int rebuild; /*!< from --rebuilddb */ | |
| 12 | int verify; /*!< from --verifydb */ | |
| 13 | ||
| 14 | Index: rpm/rpmdb/poptDB.c | |
| 15 | RCS File: /v/rpm/cvs/rpm/rpmdb/poptDB.c,v | |
| 16 | rcsdiff -q -kk '-r1.6' '-r1.6.2.1' -u '/v/rpm/cvs/rpm/rpmdb/poptDB.c,v' 2>/dev/null | |
| 17 | --- poptDB.c 2007/05/25 17:36:33 1.6 | |
| 18 | +++ poptDB.c 2007/07/30 03:07:58 1.6.2.1 | |
| 19 | @@ -14,8 +14,6 @@ | |
| 20 | /** | |
| 21 | */ | |
| 22 | struct poptOption rpmDatabasePoptTable[] = { | |
| 23 | - { "initdb", '\0', POPT_ARG_VAL, &rpmDBArgs.init, 1, | |
| 24 | - N_("initialize database"), NULL}, | |
| 25 | { "rebuilddb", '\0', POPT_ARG_VAL, &rpmDBArgs.rebuild, 1, | |
| 26 | N_("rebuild database inverted lists from installed package headers"), | |
| 27 | NULL}, | |
| 28 | Index: rpm/rpmqv.c | |
| 29 | RCS File: /v/rpm/cvs/rpm/rpmqv.c,v | |
| 30 | rcsdiff -q -kk '-r1.113.2.1' '-r1.113.2.2' -u '/v/rpm/cvs/rpm/rpmqv.c,v' 2>/dev/null | |
| 31 | --- rpmqv.c 2007/06/05 22:48:08 1.113.2.1 | |
| 32 | +++ rpmqv.c 2007/07/30 03:07:58 1.113.2.2 | |
| 33 | @@ -290,12 +290,6 @@ | |
| 34 | ||
| 35 | #ifdef IAM_RPMDB | |
| 36 | if (bigMode == MODE_UNKNOWN || (bigMode & MODES_DB)) { | |
| 37 | - if (da->init) { | |
| 38 | - if (bigMode != MODE_UNKNOWN) | |
| 39 | - argerror(_("only one major mode may be specified")); | |
| 40 | - else | |
| 41 | - bigMode = MODE_INITDB; | |
| 42 | - } else | |
| 43 | if (da->rebuild) { | |
| 44 | if (bigMode != MODE_UNKNOWN) | |
| 45 | argerror(_("only one major mode may be specified")); |