summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-dev/attachments/20120424/2933e584/attachment-0001.obj
blob: 21dd6f870171a7f66301d297d6237ea8e9a51c47 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 44d9bf9..7034ffb 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -385,6 +385,7 @@ sub main {
 	    newt      => sub { $o->{interactive} = "curses" },
 	    text      => sub { $o->{interactive} = "curses" },
 	    stdio     => sub { $o->{interactive} = "stdio" },
+	    skip      => sub { $o->{skipped_packages} = $v },
 	    use_uuid  => sub { $::no_uuid_by_default = !$v },
 	    kickstart => sub { $::auto_install = $v },
 	    local_install => sub { $::local_install = 1 },
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index d821ab8..38ccd5e 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -504,7 +504,7 @@ sub configure_media {
     my ($packages) = @_;
     urpm::media::update_media($packages, distrib => 1, callback => \&urpm::download::sync_logger) or
         log::l('updating media failed');
-    urpm::media::configure($packages);
+    urpm::media::configure($packages, cmdline_skiplist => $::o->{skipped_packages});
 }
 
 sub get_media {