summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-11-09 14:42:05 +0000
committerFrancois Pons <fpons@mandriva.com>1999-11-09 14:42:05 +0000
commitc3b5ff8158ed25327e34de957573b8c17b80b0eb (patch)
tree6fb3b61db8333f7a621bb38d4bd3daf02accc88f
parent5442399c701c34ef4803f46ab756c89a0e1618e5 (diff)
downloaddrakx-c3b5ff8158ed25327e34de957573b8c17b80b0eb.tar
drakx-c3b5ff8158ed25327e34de957573b8c17b80b0eb.tar.gz
drakx-c3b5ff8158ed25327e34de957573b8c17b80b0eb.tar.bz2
drakx-c3b5ff8158ed25327e34de957573b8c17b80b0eb.tar.xz
drakx-c3b5ff8158ed25327e34de957573b8c17b80b0eb.zip
*** empty log message ***
-rw-r--r--perl-install/common.pm5
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/pkgs.pm5
3 files changed, 11 insertions, 1 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 31caedba1..4a15ebef9 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -205,7 +205,10 @@ sub all {
local *F;
opendir F, $d or die "all: can't open dir $d: $!\n";
- grep { $_ ne '.' && $_ ne '..' } readdir F;
+ my @l = grep { $_ ne '.' && $_ ne '..' } readdir F;
+ closedir F;
+
+ @l;
}
sub glob_ {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 505dbae6b..9b3a080f0 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -218,6 +218,8 @@ sub installPackages($$) {
sub afterInstallPackages($) {
my ($o) = @_;
+ pkgs::done_db();
+
#- why not? cuz weather is nice today :-) [pixel]
sync(); sync();
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 1e8c2326e..0179bf45d 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -313,6 +313,11 @@ sub init_db {
$isUpgrade ? c::rpmdbRebuild($prefix) : c::rpmdbInit($prefix, 0644) or die "creation/rebuilding of rpm database failed: ", c::rpmErrorString();
}
+sub done_db {
+ log::l("closing install.log file");
+ close LOG;
+}
+
sub getHeader($) {
my ($p) = @_;