summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-11-17 21:49:12 +0000
committerFrancois Pons <fpons@mandriva.com>1999-11-17 21:49:12 +0000
commit38dea3d2412ecdbe2988f58b7ce7a905aff5fb10 (patch)
tree6a4930b84e120014513038548a797eab8ef1035f /perl-install/pkgs.pm
parent0eba4a2a3ff3e37bb8a08477f556fe3f97351d7b (diff)
downloaddrakx-backup-do-not-use-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.tar
drakx-backup-do-not-use-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.tar.gz
drakx-backup-do-not-use-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.tar.bz2
drakx-backup-do-not-use-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.tar.xz
drakx-backup-do-not-use-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.zip
*** empty log message ***
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 60ccfcf43..f25357a49 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -318,11 +318,13 @@ sub init_db {
c::rpmErrorSetCallback(fileno LOG);
#- c::rpmSetVeryVerbose();
- log::l("reading /usr/lib/rpm/rpmrc");
- c::rpmReadConfigFiles() or die "can't read rpm config files";
- log::l("\tdone");
+# log::l("reading /usr/lib/rpm/rpmrc");
+# c::rpmReadConfigFiles() or die "can't read rpm config files";
+# log::l("\tdone");
- $isUpgrade ? c::rpmdbRebuild($prefix) : c::rpmdbInit($prefix, 0644) or die "creation/rebuilding of rpm database failed: ", c::rpmErrorString();
+ $isUpgrade and c::rpmdbRebuild($prefix) || die "rebuilding of rpm database failed: ", c::rpmErrorString();
+ c::rpmdbInit($prefix, 0644) || die "creation of rpm database failed: ", c::rpmErrorString();
+#- $isUpgrade ? c::rpmdbRebuild($prefix) : c::rpmdbInit($prefix, 0644) or die "creation/rebuilding of rpm database failed: ", c::rpmErrorString();
}
sub done_db {
@@ -447,6 +449,7 @@ sub selectPackagesToUpgrade($$$) {
#- close db, job finished !
c::rpmdbClose($db);
+ log::l("done selecting packages to upgrade");
}
sub install($$) {
@@ -486,7 +489,7 @@ sub install($$) {
eval { fs::mount("/proc", "$prefix/proc", "proc", 0) };
- log::ld("starting installation: ", $nb, " packages, ", $total, " bytes");
+ log::l("starting installation: ", $nb, " packages, ", $total, " bytes");
#- !! do not translate these messages, they are used when catched (cf install_steps_gtk)
my $callbackOpen = sub {