Document the "skip" option. Remove obsolete code.

3 files changed, 6 insertions, 12 deletions

diff --git a/urpm.pm b/urpm.pm
index e31c4545..bc59cbea 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -532,7 +532,7 @@ sub configure {
     unless ($options{noskipping}) {
 	my %uniq;
 	$urpm->compute_flags(
-	    $urpm->get_packages_list($urpm->{skiplist}, $options{skip}),
+	    get_packages_list($urpm->{skiplist}, $options{skip}),
 	    skip => 1,
 	    callback => sub {
 		my ($urpm, $pkg) = @_;
@@ -545,7 +545,7 @@ sub configure {
     unless ($options{noinstalling}) {
 	my %uniq;
 	$urpm->compute_flags(
-	    $urpm->get_packages_list($urpm->{instlist}, $options{inst}),
+	    get_packages_list($urpm->{instlist}),
 	    disable_obsolete => 1,
 	    callback => sub {
 		my ($urpm, $pkg) = @_;
@@ -2157,7 +2157,7 @@ sub create_transaction {
 #-     3. version specification (a comparison operator and a version number)
 #-     4. the rest of the line is ignored
 sub get_packages_list {
-    my ($urpm, $file, $extra) = @_;
+    my ($file, $extra) = @_;
     my %val;
     local $_;
     open my $f, $file or return {};
@@ -2170,12 +2170,6 @@ sub get_packages_list {
     close $f;
     \%val;
 }
-#- for compability...
-sub get_unwanted_packages {
-    my ($urpm, $skip) = @_;
-    print STDERR "calling obsoleted method urpm::get_unwanted_packages\n";
-    get_packages_list($urpm->{skiplist}, $skip);
-}
 
 #- select source for package selected.
 #- according to keys given in the packages hash.
diff --git a/urpm/args.pm b/urpm/args.pm
index d9a58286..09d748d5 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -105,7 +105,7 @@ my %options_spec = (
 	},
 	'verify-rpm!' => sub { $urpm->{options}{'verify-rpm'} = $_[1] },
 	'test!' => \$::test,
-	'skip=s' => \$::skip,
+	'skip=s' => \$options{skip},
 	'root=s' => \$::root,
 	'use-distrib=s' => \$::usedistrib,
 	'excludepath|exclude-path=s' => sub { $urpm->{options}{excludepath} = $_[1] },
diff --git a/urpmi b/urpmi
index 03e145de..4dddb535 100755
--- a/urpmi
+++ b/urpmi
@@ -47,7 +47,6 @@ our $parallel = '';
 our $env = '';
 our $WID = 0;
 our $test = 0;
-our $skip = '';
 our $root = '';
 our $all = 0;
 our $rpm_opt = "vh";
@@ -124,6 +123,7 @@ usage:
 ") . N("  --test         - verify if the installation can be achieved correctly.
 ") . N("  --excludepath  - exclude path separated by comma.
 ") . N("  --excludedocs  - exclude docs files.
+") . N("  --skip         - packages which installation should be skipped
 ") . N("  -a             - select all matches on command line.
 ") . N("  -p             - allow search in provides to find package.
 ") . N("  -P             - do not search in provides to find package.
@@ -320,7 +320,7 @@ $urpm->configure(nocheck_access => $env || $uid > 0,
 		 sortmedia => $sortmedia,
 		 synthesis => $synthesis,
 		 update => $update,
-		 skip => $skip,
+		 skip => $urpm::options::{skip},
 		 root => $root,
 		 bug => $bug,
 		 parallel => $parallel,