summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-18 16:46:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-18 16:46:15 +0000
commit66ab26598afa8239868d32b5118304c629dafe81 (patch)
tree1f63e8243f05ef4c4d93a5f6942cdba0ac2541cb
parent1c459d805a75d0c1931d651c04df3ed01489d1c7 (diff)
downloadurpmi-66ab26598afa8239868d32b5118304c629dafe81.tar
urpmi-66ab26598afa8239868d32b5118304c629dafe81.tar.gz
urpmi-66ab26598afa8239868d32b5118304c629dafe81.tar.bz2
urpmi-66ab26598afa8239868d32b5118304c629dafe81.tar.xz
urpmi-66ab26598afa8239868d32b5118304c629dafe81.zip
- urpmi
o --install-src will succesfully installed src.rpm from /var/cache/urpmi/rpms/* (unless post-clean is 0) we could not do that by default because "urpmi --install-src" as user could not download the file
-rw-r--r--NEWS2
-rw-r--r--urpm.pm6
-rw-r--r--urpm/main_loop.pm5
3 files changed, 13 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 4f5033e4..a0277566 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@
o fix displaying error message when failing to lock (regression in 5.1)
- urpmi:
o --install-src as user now works for remote medium
+ o --install-src will succesfully installed src.rpm from
+ /var/cache/urpmi/rpms/* (unless post-clean is 0)
- urpmf:
o add special code for --files simple case, it makes urpmf 3x faster for
this often used case
diff --git a/urpm.pm b/urpm.pm
index f89e819e..8f833094 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -113,6 +113,12 @@ sub userdir {
$dir;
}
+sub is_temporary_file {
+ my ($urpm, $f) = @_;
+
+ begins_with($f, $urpm->{cachedir});
+}
+
sub set_files {
my ($urpm, $urpmi_root) = @_;
my %h = (
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index c99ce474..6491dab0 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -124,6 +124,11 @@ foreach my $set (@{$state->{transaction} || []}) {
if ($?) {
print N("Installation failed"), "\n";
++$nok;
+ } elsif ($urpm->{options}{'post-clean'}) {
+ if (my @tmp_srpm = grep { urpm::is_temporary_file($urpm, $_) } @l) {
+ $urpm->{log}(N("removing installed rpms (%s)", join(' ', @tmp_srpm)));
+ unlink @tmp_srpm;
+ }
}
}
next;