From 718a01fdf522c8d02e7a1d4ffb80b28c8555c483 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 5 Oct 2012 16:04:37 +0000
Subject: drop --repackage option (non working since rpm-4.6 in 2009)

should have been done right after commit r251061 by pixel on Tue Jan
2009: "- drop urpmi.recover
(no more possible with rpm 4.6 which doesn't handle --repackage)"
---
 urpm/args.pm    | 3 +--
 urpm/cfg.pm     | 1 -
 urpm/install.pm | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'urpm')

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
 
-- 
cgit v1.2.1