diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-09-19 14:49:36 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-09-19 14:49:36 +0000 |
| commit | 4710960f1314ec790ea876f0e50250cac59e089c (patch) | |
| tree | ebf7ffacad519615bc779e28e108af7fff27d14b /perl-install/pkgs.pm | |
| parent | bb1b2617bc36e258f13d375faaaec1bfff97080e (diff) | |
| download | drakx-backup-do-not-use-4710960f1314ec790ea876f0e50250cac59e089c.tar drakx-backup-do-not-use-4710960f1314ec790ea876f0e50250cac59e089c.tar.gz drakx-backup-do-not-use-4710960f1314ec790ea876f0e50250cac59e089c.tar.bz2 drakx-backup-do-not-use-4710960f1314ec790ea876f0e50250cac59e089c.tar.xz drakx-backup-do-not-use-4710960f1314ec790ea876f0e50250cac59e089c.zip | |
no_comment
Diffstat (limited to 'perl-install/pkgs.pm')
| -rw-r--r-- | perl-install/pkgs.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index de156d498..953e02837 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -236,7 +236,7 @@ sub setSelectedFromCompssList($$$$$) { sub init_db { my ($prefix, $isUpgrade) = @_; - my $f = "$prefix/root/" . ($isUpgrade ? "upgrade" : "install") . ".log"; + my $f = "$prefix/root/install.log"; open(F, "> $f") ? log::l("opened $f") : log::l("Failed to open $f. No install log will be kept."); $fd = fileno(F) || log::fd() || 2; c::rpmErrorSetCallback($fd); @@ -260,7 +260,7 @@ sub getHeader($) { } sub install { - my ($prefix, $toInstall, $isUpgrade, $force) = @_; + my ($prefix, $toInstall, $force) = @_; return if $::g_auto_install; @@ -278,7 +278,7 @@ sub install { $p->{file} ||= sprintf "%s-%s-%s.%s.rpm", $p->{name}, $p->{version}, $p->{release}, c::headerGetEntry(getHeader($p), 'arch'); - c::rpmtransAddPackage($trans, getHeader($p), $p->{file}, $isUpgrade); + c::rpmtransAddPackage($trans, getHeader($p), $p->{file}, $p->{name} !~ /kernel/); #- TODO: replace `named kernel' by `provides kernel' $nb++; $total += $p->{size}; } |