diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-01-06 11:23:39 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-01-06 11:23:39 +0000 |
| commit | 1aa830a04246a89a305be3ca3b8b2615c1d88065 (patch) | |
| tree | bee63f704d59092c933a62383ac3770439dfa515 /perl-install/pkgs.pm | |
| parent | 196c5ec6d2417109b37088d98c8e6177d6f90909 (diff) | |
| download | drakx-1aa830a04246a89a305be3ca3b8b2615c1d88065.tar drakx-1aa830a04246a89a305be3ca3b8b2615c1d88065.tar.gz drakx-1aa830a04246a89a305be3ca3b8b2615c1d88065.tar.bz2 drakx-1aa830a04246a89a305be3ca3b8b2615c1d88065.tar.xz drakx-1aa830a04246a89a305be3ca3b8b2615c1d88065.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/pkgs.pm')
| -rw-r--r-- | perl-install/pkgs.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 2679f80ef..0cbe641bd 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -412,11 +412,11 @@ sub selectPackagesToUpgrade($$$;$$) { if ($p) { eval { getHeader($p) }; $@ && log::l("cannot get the header for package $p->{name}"); my $version_cmp = versionCompare(c::headerGetEntry($header, 'version'), $p->{version}); - my $version_rel_cmp = $p->{header} ? c::rpmVersionCompare($header, $p->{header}) : + my $version_rel_test = $p->{header} ? c::rpmVersionCompare($header, $p->{header}) >= 0 : ($version_cmp > 0 || $version_cmp == 0 && - versionCompare(c::headerGetEntry($header, 'release'), $p->{release})); - if ($version_rel_cmp >= 0) { + versionCompare(c::headerGetEntry($header, 'release'), $p->{release}) >= 0); + if ($version_rel_test) { if ($otherPackage && $version_cmp <= 0) { $toRemove{$otherPackage} = 1; #- force removing for theses other packages, select our. } else { @@ -600,7 +600,7 @@ sub install($$$) { }; c::rpmtransSetScriptFd($trans, fileno LOG); - eval { fs::mount("/proc", "$prefix/proc", "proc", 0) }; + eval { fs::mount("/proc", "$prefix/proc", "proc", 0) } unless -e "$prefix/proc/cpuinfo"; my $callbackOpen = sub { my $f = (my $p = $packages{$_[0]})->{file}; @@ -651,7 +651,7 @@ sub remove($$) { c::rpmtransRemovePackages($db, $trans, $p) if $p !~ /kernel/; } - eval { fs::mount("/proc", "$prefix/proc", "proc", 0) }; + eval { fs::mount("/proc", "$prefix/proc", "proc", 0) } unless -e "$prefix/proc/cpuinfo"; my $callbackOpen = sub { log::l("trying to open file from $_[0] which should not happen"); }; my $callbackClose = sub { log::l("trying to close file from $_[0] which should not happen"); }; |