diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | pod/5/urpmi.cfg.pod | 5 | ||||
| -rw-r--r-- | pod/8/urpme.pod | 10 | ||||
| -rw-r--r-- | pod/8/urpmi.pod | 12 | ||||
| -rw-r--r-- | urpm/args.pm | 3 | ||||
| -rw-r--r-- | urpm/cfg.pm | 1 | ||||
| -rw-r--r-- | urpm/install.pm | 3 | ||||
| -rwxr-xr-x | urpme | 1 | ||||
| -rwxr-xr-x | urpmi | 1 |
9 files changed, 3 insertions, 34 deletions
@@ -1,5 +1,6 @@ - drop again urpmi.recover (no more possible since rpm 4.6 which doesn't handle --repackage) +- drop --repackage option (non working since 2009) - library: o enhanced doc diff --git a/pod/5/urpmi.cfg.pod b/pod/5/urpmi.cfg.pod index a7eeff26..baf35fbc 100644 --- a/pod/5/urpmi.cfg.pod +++ b/pod/5/urpmi.cfg.pod @@ -175,11 +175,6 @@ like B<basesystem> dependencies). Same as B<--prozilla-options> for urpmi, urpmq or urpmi.addmedia. Additional options to pass to B<prozilla> when downloading files. -=item B<repackage> - -Same as specifying B<--repackage> for urpmi. Disabled by default. -Ignored when it's set globally by urpmi.recover. - =item B<resume> Same as specifying B<--resume> for urpmi. Resume transfer of partially-downloaded files. diff --git a/pod/8/urpme.pod b/pod/8/urpme.pod index e7e0c7c6..eead9f78 100644 --- a/pod/8/urpme.pod +++ b/pod/8/urpme.pod @@ -69,16 +69,6 @@ urpmi (currently, urpmi-parallel-ka-run or urpmi-parallel-ssh are available) and which machines should be updated. This alias is defined in the file F</etc/urpmi/parallel.cfg> as described below. -=item B<--repackage> - -Save previous state of upgraded packages; in other words, save the old -rpms (usually in F</var/spool/repackage>, but you can override this with -an rpm macro.) This is equivalent to providing the B<--repackage> flag to -rpm. - -If you want to use the repackage/rollback functionality of rpm, you should -check out the C<urpmi.recover> tool. - =item B<--root> I<directory> Use the file system tree rooted for rpm install. All operations and diff --git a/pod/8/urpmi.pod b/pod/8/urpmi.pod index 508a5ed2..c9fd27a4 100644 --- a/pod/8/urpmi.pod +++ b/pod/8/urpmi.pod @@ -349,18 +349,6 @@ architecture of the host. This is equivalent to C<rpm --ignorearch>. Don't check file systems for sufficient disk space before installation. This is equivalent to C<rpm --ignoresize>. -=item B<--repackage> - -Save previous state of upgraded packages; in other words, save the old -rpms (usually in F</var/spool/repackage>, but you can override this with -an rpm macro.) This is equivalent to providing the B<--repackage> flag to -rpm. - -I<Note:> if you use C<urpmi.recover> to set up a repackage policy, you -don't need this option, because C<urpmi.recover> will globally override -the appropriate rpm macro that enables repacking of all rpm transactions -system-wide. - =item B<--noscripts> Don't execute the scriptlets. diff --git a/urpm/args.pm b/urpm/args.pm index 315f2586..66766033 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -178,7 +178,6 @@ my %options_spec = ( 'ignorearch' => sub { $urpm->{options}{ignorearch} = 1 }, noscripts => sub { $urpm->{options}{noscripts} = 1 }, replacefiles => sub { $urpm->{options}{replacefiles} = 1 }, - repackage => sub { $urpm->{options}{repackage} = 1 }, 'more-choices' => sub { $urpm->{options}{morechoices} = 1 }, 'expect-install!' => \$::urpm::main_loop::expect_install, 'nolock' => \$options{nolock}, @@ -407,7 +406,7 @@ foreach my $k ('allow-medium-change', 'auto', 'auto-select', 'clean', 'download- $options_spec{gurpmi2} = $options_spec{gurpmi}; foreach my $k ("test!", "force", "root=s", "use-distrib=s", 'env=s', - 'repackage', 'noscripts', 'auto', 'auto-orphans', 'justdb', + 'noscripts', 'auto', 'auto-orphans', 'justdb', "parallel=s") { $options_spec{urpme}{$k} = $options_spec{urpmi}{$k}; diff --git a/urpm/cfg.pm b/urpm/cfg.pm index 2a2f1548..75487c98 100644 --- a/urpm/cfg.pm +++ b/urpm/cfg.pm @@ -184,7 +184,6 @@ sub load_config_raw { |keep |ignoresize |auto - |repackage |strict-arch |nopubkey |resume)(?:\s*:\s*(.*))?$/x diff --git a/urpm/install.pm b/urpm/install.pm index 1171579c..ee254a44 100644 --- a/urpm/install.pm +++ b/urpm/install.pm @@ -167,7 +167,6 @@ sub options { ( excludepath => $urpm->{options}{excludepath}, excludedocs => $urpm->{options}{excludedocs}, - repackage => $urpm->{options}{repackage}, post_clean_cache => $urpm->{options}{'post-clean'}, nosize => $urpm->{options}{ignoresize}, ignorearch => $urpm->{options}{ignorearch}, @@ -185,7 +184,7 @@ options: callback_inst, callback_trans, callback_report_uninst, post_clean_cache, verbose (more options for trans->run) - excludedocs, nosize, noscripts, oldpackage, repackage, replacepkgs, justdb, ignorearch + excludedocs, nosize, noscripts, oldpackage, replacepkgs, justdb, ignorearch =cut @@ -45,7 +45,6 @@ sub usage() { ") . N(" --test - verify if the removal can be achieved correctly. ") . N(" --force - force invocation even if some packages do not exist. ") . N(" --parallel - distributed urpmi across machines of alias. -") . N(" --repackage - Re-package the files before erasing ") . N(" --root - use another root for rpm removal. ") . N(" --urpmi-root - use another root for urpmi db & rpm installation. ") . N(" --justdb - update only the rpm db, not the filesystem. @@ -135,7 +135,6 @@ sub usage () { ") . N(" --ignorearch - allow to install rpms for unmatched architectures. ") . N(" --noscripts - do not execute package scriptlet(s) ") . N(" --replacefiles - ignore file conflicts -") . N(" --repackage - Re-package the files before erasing ") . N(" --skip - packages which installation should be skipped ") . N(" --prefer - packages which should be preferred ") . N(" --more-choices - when several packages are found, propose more choices |