diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-dev/attachments/20120424 | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20120424')
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20120424/2933e584/attachment-0001.obj | 25 | ||||
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20120424/2933e584/attachment.obj | 25 |
2 files changed, 50 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20120424/2933e584/attachment-0001.obj b/zarb-ml/mageia-dev/attachments/20120424/2933e584/attachment-0001.obj new file mode 100644 index 000000000..21dd6f870 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120424/2933e584/attachment-0001.obj @@ -0,0 +1,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 {
\ No newline at end of file diff --git a/zarb-ml/mageia-dev/attachments/20120424/2933e584/attachment.obj b/zarb-ml/mageia-dev/attachments/20120424/2933e584/attachment.obj new file mode 100644 index 000000000..21dd6f870 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120424/2933e584/attachment.obj @@ -0,0 +1,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 {
\ No newline at end of file |