diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-05-26 06:56:56 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-05-26 06:56:56 +0000 |
| commit | 5aa7ace09b0e66cd6c75c83e8853460435089286 (patch) | |
| tree | d83892b13bd016fa17cf455c1e45529161375322 | |
| parent | 12f4fdf49996f1da16ffdc6cc26824dfb648a502 (diff) | |
| download | drakx-backup-do-not-use-5aa7ace09b0e66cd6c75c83e8853460435089286.tar drakx-backup-do-not-use-5aa7ace09b0e66cd6c75c83e8853460435089286.tar.gz drakx-backup-do-not-use-5aa7ace09b0e66cd6c75c83e8853460435089286.tar.bz2 drakx-backup-do-not-use-5aa7ace09b0e66cd6c75c83e8853460435089286.tar.xz drakx-backup-do-not-use-5aa7ace09b0e66cd6c75c83e8853460435089286.zip | |
Remove spurious field
| -rw-r--r-- | perl-install/pkgs.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 8f3d784e6..d895b07c2 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -960,7 +960,7 @@ sub selectPackagesToUpgrade { sub allowedToUpgrade { $_[0] !~ /^(kernel|kernel22|kernel2.2|kernel-secure|kernel-smp|kernel-linus|kernel-linus2.2|hackkernel|kernel-enterprise)$/ } -sub supplCDMountPoint() { $::o->{mainmethod} eq 'cdrom' ? "/tmp/image" : "/mnt/cdrom" } +sub supplCDMountPoint() { install_medium::by_id(1)->method eq 'cdrom' ? "/tmp/image" : "/mnt/cdrom" } sub installTransactionClosure { my ($packages, $id2pkg) = @_; @@ -999,7 +999,6 @@ sub installTransactionClosure { #- Supplementary CD : switch temporarily to "cdrom" method my $suppl_CD = $medium->is_suppl_cd; - $::o->{mainmethod} = $::o->{method}; local $::o->{method} = do { my $cdrom; cat_("/proc/mounts") =~ m,(/dev/\S+)\s+(?:/mnt/cdrom|/tmp/image), and $cdrom = $1; |