summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-04-05 17:41:55 +0000
committerFrancois Pons <fpons@mandriva.com>2001-04-05 17:41:55 +0000
commitdf6a3ced18fd293a1a1a8121b2f98287b40dcd37 (patch)
tree529ec17ddbfc5cebd36c5da773fe7956f3989cc3 /urpm.pm
parent53adad829a72e471e29e5c47c852913d9ed821a8 (diff)
downloadurpmi-df6a3ced18fd293a1a1a8121b2f98287b40dcd37.tar
urpmi-df6a3ced18fd293a1a1a8121b2f98287b40dcd37.tar.gz
urpmi-df6a3ced18fd293a1a1a8121b2f98287b40dcd37.tar.bz2
urpmi-df6a3ced18fd293a1a1a8121b2f98287b40dcd37.tar.xz
urpmi-df6a3ced18fd293a1a1a8121b2f98287b40dcd37.zip
*** empty log message ***
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index a56b231b..ba9c046b 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1211,7 +1211,7 @@ sub deselect_unwanted_packages {
#- have a null list.
sub get_source_packages {
my ($urpm, $packages) = @_;
- my ($error, @local_sources, @list, %select);
+ my ($error, @local_to_removes, @local_sources, @list, %select);
local (*D, *F, $_);
#- examine the local repository, which is trusted.
@@ -1222,8 +1222,11 @@ sub get_source_packages {
#- check version, release and id selected.
#- TODO arch is not checked at this point.
- $pkg->{version} eq $2 && $pkg->{release} eq $3 or next;
- exists $packages->{$pkg->{id}} or next;
+ unless ($pkg->{version} eq $2 && $pkg->{release} eq $3 && exists $packages->{$pkg->{id}}) {
+ #- keep in mind these have to be deleted or space will be tight soon...
+ push @local_to_removes, "$urpm->{cachedir}/rpms/$_";
+ next;
+ }
#- make sure only the first matching is taken...
exists $select{$pkg->{id}} and next; $select{$pkg->{id}} = undef;
@@ -1288,7 +1291,7 @@ sub get_source_packages {
}
}
- $error ? () : ( \@local_sources, \@list );
+ $error ? () : ( \@local_sources, \@list, \@local_to_removes );
}
#- upload package that may need to be uploaded.