summaryrefslogtreecommitdiff
path: root/lib/poptI.c
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2008-03-17 14:10:11 +0200
committerPanu Matilainen <pmatilai@redhat.com>2008-03-17 14:10:11 +0200
commitd89482a7c7777d379ab415ebba747b6af19babdb (patch)
tree086729e83518cbac0b829f6cb8d6e7054ebcead4 /lib/poptI.c
parent37543ee0405c38a9d54a12bf0d54698773a3933c (diff)
downloadrpm-d89482a7c7777d379ab415ebba747b6af19babdb.tar.gz
rpm-d89482a7c7777d379ab415ebba747b6af19babdb.tar.bz2
rpm-d89482a7c7777d379ab415ebba747b6af19babdb.zip
Remove repackage support to finish off with rollback
The two main classes of rollback/repackage need are 1) Gimme back the previous version, this broke XYZ on my system. This is better handled by downgrading to the previous version of original package instead of repackaged garbage. We should maintain real package (version) history somewhere. 2) Upgrade messed up my configuration. Instead of repackaging everything we could be far more intelligent wrt config files, stick them into real version control or at least have hooks to do so. RPMCALLBACK_REPACKAGE_* and RPMTRANS_FLAG_REPACKAGE definitions left around to avoid needlessly breaking everybodys callbacks (for now)
Diffstat (limited to 'lib/poptI.c')
-rw-r--r--lib/poptI.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/poptI.c b/lib/poptI.c
index 9c72d8c8b..9aff68528 100644
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -148,9 +148,6 @@ struct poptOption rpmInstallPoptTable[] = {
&rpmIArgs.transFlags, RPMTRANS_FLAG_DEPLOOPS,
N_("print dependency loops as warning"), NULL},
- { "dirstash", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_DIRSTASH,
- N_("save erased package files by renaming into sub-directory"), NULL},
{ "erase", 'e', POPT_BIT_SET,
&rpmIArgs.installInterfaceFlags, INSTALL_ERASE,
N_("erase (uninstall) package"), N_("<package>+") },
@@ -268,9 +265,6 @@ struct poptOption rpmInstallPoptTable[] = {
{ "relocate", '\0', POPT_ARG_STRING, 0, POPT_RELOCATE,
N_("relocate files from path <old> to <new>"),
N_("<old>=<new>") },
- { "repackage", '\0', POPT_BIT_SET,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_REPACKAGE,
- N_("save erased package files by repackaging"), NULL},
{ "replacefiles", '\0', POPT_BIT_SET, &rpmIArgs.probFilter,
(RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
N_("ignore file conflicts between packages"), NULL},