summaryrefslogtreecommitdiffstats
path: root/perl-install/Makefile.config
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-14 21:33:04 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-14 21:33:04 +0000
commitbddcf038334d4628a5ede36bce49175673860177 (patch)
tree1a85161406bdd545e385ea066f6d4b31c883e7d3 /perl-install/Makefile.config
parent0db38f3b252c37bb6db38c1dc7b93e4bcc35e9b9 (diff)
downloaddrakx-bddcf038334d4628a5ede36bce49175673860177.tar
drakx-bddcf038334d4628a5ede36bce49175673860177.tar.gz
drakx-bddcf038334d4628a5ede36bce49175673860177.tar.bz2
drakx-bddcf038334d4628a5ede36bce49175673860177.tar.xz
drakx-bddcf038334d4628a5ede36bce49175673860177.zip
10.15
Diffstat (limited to 'perl-install/Makefile.config')
-rw-r--r--perl-install/Makefile.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 9939f2ac3..6127fe200 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
# -*- Makefile -*-
-VERSION:=10.14
+VERSION:=10.15
SUDO = sudo
TMPDIR = /tmp
pe:$amount:$total\n";
});
- log::l("rpmRunTransactions done, now trying to close still opened fd");
+ log::l("transactions done, now trying to close still opened fd");
install_any::getFile('XXX'); #- close still opened fd.
@probs and die "installation of rpms failed:\n ", join("\n ", @probs);
@@ -1516,18 +1516,12 @@ sub remove($$) {
return if $::g_auto_install || !@{$toRemove || []};
- log::l("reading /usr/lib/rpm/rpmrc");
- c::rpmReadConfigFiles() or die "can't read rpm config files";
- log::l("\tdone");
-
- my $db = c::rpmdbOpen($prefix) or die "error opening RPM database: ", c::rpmErrorString();
- log::l("opened rpm database for removing old packages");
-
- my $trans = c::rpmtransCreateSet($db, $prefix);
+ my $db = URPM::DB::open($prefix, 1) or die "error opening RPM database: ", c::rpmErrorString();
+ my $trans = $db->create_transaction($prefix);
foreach my $p (@$toRemove) {
#- stuff remove all packages that matches $p, not a problem since $p has name-version-release format.
- c::rpmtransRemovePackages($db, $trans, $p) if allowedToUpgrade($p);
+ $trans->remove($p) if allowedToUpgrade($p);
}
eval { fs::mount("/proc", "$prefix/proc", "proc", 0) } unless -e "$prefix/proc/cpuinfo";
@@ -1543,13 +1537,9 @@ sub remove($$) {
#- place (install_steps_gtk.pm,...).
installCallback($db, 'user', undef, 'remove', scalar @$toRemove);
- #- TODO
- if (my @probs = c::rpmRunTransactions($trans, $callbackOpen, $callbackClose, \&installCallback, 1)) {
+ if (my @probs = $trans->run(undef, force => 1)) {
die "removing of old rpms failed:\n ", join("\n ", @probs);
}
- c::rpmtransFree($trans);
- c::rpmdbClose($db);
- log::l("rpm database closed");
#- keep in mind removing of these packages by cleaning $toRemove.
@{$toRemove || []} = ();