4.3-1mdk

1 files changed, 5 insertions, 4 deletions

diff --git a/urpmq b/urpmq
index c8496f4c..a7166a2b 100755
--- a/urpmq
+++ b/urpmq
@@ -37,6 +37,7 @@ usage:
 ", $urpm::VERSION) . N("  --help         - print this help message.
 ") . N("  --update       - use only update media.
 ") . N("  --media        - use only the given media, separated by comma.
+") . N("  --excludemedia - do not use only the given media, separated by comma.
 ") . N("  --synthesis    - use the synthesis given instead of urpmi db.
 ") . N("  --auto-select  - automatically select packages to upgrade the system.
 ") . N("  --fuzzy        - impose fuzzy search (same as -y).
@@ -82,6 +83,7 @@ while (defined($_ = shift @ARGV)) {
     /^--help$/ and do { usage };
     /^--update$/ and do { $query->{update} = 1; next };
     /^--media$/ and do { push @nextargv, \$query->{media}; next };
+    /^--exclude-?media$/ and do { push @nextargv, \$query->{excludemedia}; next };
     /^--mediums$/ and do { push @nextargv, \$query->{media}; next };
     /^--synthesis$/ and do { push @nextargv, \$query->{synthesis}; next };
     /^--auto-select$/ and do { $query->{deps} = $query->{upgrade} = $query->{auto_select} = 1; next };
@@ -94,6 +96,7 @@ while (defined($_ = shift @ARGV)) {
     /^--headers$/ and do { $query->{headers} = 1; next };
     /^--sources$/ and do { $query->{sources} = 1; next };
     /^--force$/ and do { $query->{force} = 1; next };
+    /^--skip$/ and do { push @nextargv, \$query->{skip}; next };
     /^--root$/ and do { push @nextargv, \$query->{root}; next };
     /^--parallel$/ and do { push @nextargv, \$query->{parallel}; next };
     /^--wget$/ and do { $urpm->{sync} = sub { my $options = shift @_;
@@ -149,8 +152,10 @@ $query->{verbose} or $urpm->{log} = sub {};
 
 $urpm->configure(nocheck_access => 1,
 		 media => $query->{media},
+		 excludemedia => $query->{excludemedia},
 		 synthesis => $query->{synthesis},
 		 update => $query->{update},
+		 skip => $query->{skip},
 		 root => $query->{root},
 		 parallel => $query->{parallel},
 		);
@@ -285,9 +290,6 @@ if ($query->{list_aliases}) {
 	$state->{selected} = \%requested;
     }
 
-    #- get out of package that should not be upgraded.
-    $urpm->deselect_unwanted_packages($state->{selected});
-
     if ($query->{headers} || $query->{sources}) {
 	my ($local_sources, $list) = $urpm->get_source_packages($state->{selected});
 	unless ($local_sources || $list) {
@@ -311,7 +313,6 @@ if ($query->{list_aliases}) {
 		} else {
 		    #- fallback to retrieve rpm package before, so that --headers will be ok.
 		    my %downloads = $urpm->download_source_packages({}, $list, 'local', undef);
-		    print STDERR join " ", "rpm2header", values %downloads;
 		    system "rpm2header", values %downloads;
 		}
 	    }