summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-09-05 14:20:06 +0000
committerFrancois Pons <fpons@mandriva.com>2003-09-05 14:20:06 +0000
commitb5cff0f69e2b0b1a1b3231c8020b0353f924b125 (patch)
tree82fc39541bf32743a34ae9a24916e0e8cf2deb89
parent95fff944457f65351c61f8b80b2eaa8c9507e868 (diff)
downloadurpmi-b5cff0f69e2b0b1a1b3231c8020b0353f924b125.tar
urpmi-b5cff0f69e2b0b1a1b3231c8020b0353f924b125.tar.gz
urpmi-b5cff0f69e2b0b1a1b3231c8020b0353f924b125.tar.bz2
urpmi-b5cff0f69e2b0b1a1b3231c8020b0353f924b125.tar.xz
urpmi-b5cff0f69e2b0b1a1b3231c8020b0353f924b125.zip
4.4-32mdk
-rw-r--r--urpm.pm40
-rw-r--r--urpmi.spec8
2 files changed, 31 insertions, 17 deletions
diff --git a/urpm.pm b/urpm.pm
index d38a5489..e3cc6ac1 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -21,6 +21,9 @@ sub N {
sprintf(Locale::gettext::gettext($format || ''), @params);
}
+#- tool functions.
+sub basename { local $_ = shift; s|/*\s*$||; s|.*/||; $_ }
+
#- create a new urpm object.
sub new {
my ($class) = @_;
@@ -320,7 +323,7 @@ sub sync_rsync {
}
foreach (@_) {
my $count = 10; #- retry count on error (if file exists).
- my $basename = /^.*\/([^\/]*)$/ && $1 || $_;
+ my $basename = basename($_);
my ($file) = /^rsync:\/\/(.*)/ or next; $file =~ /::/ or $file = $_;
propagate_sync_callback($options, 'start', $file);
do {
@@ -368,7 +371,7 @@ sub sync_ssh {
}
foreach my $file (@_) {
my $count = 10; #- retry count on error (if file exists).
- my $basename = $file =~ /^.*\/([^\/]*)$/ && $1 || $file;
+ my $basename = basename($file);
propagate_sync_callback($options, 'start', $file);
do {
local (*RSYNC, $_);
@@ -1286,7 +1289,7 @@ this could happen if you mounted manually the directory when creating the medium
#- we can assume at this point a basename is existing, but it needs
#- to be checked for being valid, nothing can be deduced if no MD5SUM
#- file are present.
- my ($basename) = $with_hdlist_dir =~ /\/([^\/]+)$/;
+ my $basename = basename($with_hdlist_dir);
if (!$options{nomd5sum} && -s reduce_pathname("$with_hdlist_dir/../MD5SUM") > 32) {
if ($options{force}) {
@@ -1330,8 +1333,8 @@ this could happen if you mounted manually the directory when creating the medium
$medium->{md5sum} = $_->{md5sum};
unlink "$urpm->{statedir}/synthesis.$medium->{hdlist}";
unlink "$urpm->{statedir}/$medium->{hdlist}";
- symlink "synthesis.$_->{hdlist}", "synthesis.$medium->{hdlist}";
- symlink $_->{hdlist}, $medium->{hdlist};
+ symlink "synthesis.$_->{hdlist}", "$urpm->{statedir}/synthesis.$medium->{hdlist}";
+ symlink $_->{hdlist}, "$urpm->{statedir}/$medium->{hdlist}";
}
#- as previously done, just read synthesis file here, this is enough.
$urpm->{log}(N("examining synthesis file [%s]",
@@ -1505,7 +1508,7 @@ this could happen if you mounted manually the directory when creating the medium
#- we can assume at this point a basename is existing, but it needs
#- to be checked for being valid, nothing can be deduced if no MD5SUM
#- file are present.
- $basename = $medium->{with_hdlist} =~ /^.*\/([^\/]*)$/ && $1 || $medium->{with_hdlist};
+ $basename = basename($medium->{with_hdlist});
unlink "$urpm->{cachedir}/partial/MD5SUM";
eval {
@@ -1560,8 +1563,8 @@ this could happen if you mounted manually the directory when creating the medium
$medium->{md5sum} = $_->{md5sum};
unlink "$urpm->{statedir}/synthesis.$medium->{hdlist}";
unlink "$urpm->{statedir}/$medium->{hdlist}";
- symlink "synthesis.$_->{hdlist}", "synthesis.$medium->{hdlist}";
- symlink $_->{hdlist}, $medium->{hdlist};
+ symlink "synthesis.$_->{hdlist}", "$urpm->{statedir}/synthesis.$medium->{hdlist}";
+ symlink $_->{hdlist}, "$urpm->{statedir}/$medium->{hdlist}";
}
#- as previously done, just read synthesis file here, this is enough.
$urpm->{log}(N("examining synthesis file [%s]", "$urpm->{statedir}/synthesis.$medium->{hdlist}"));
@@ -1596,7 +1599,7 @@ this could happen if you mounted manually the directory when creating the medium
my ($suffix) = $dir =~ /RPMS([^\/]*)\/*$/;
foreach my $with_hdlist ($medium->{with_hdlist}, probe_with_try_list($suffix, $options{probe_with})) {
- $basename = $with_hdlist =~ /^.*\/([^\/]*)$/ && $1 || $with_hdlist or next;
+ $basename = basename($with_hdlist) or next;
$options{force} and unlink "$urpm->{cachedir}/partial/$basename";
eval {
@@ -1614,7 +1617,7 @@ this could happen if you mounted manually the directory when creating the medium
}
}
} else {
- $basename = $medium->{with_hdlist} =~ /^.*\/([^\/]*)$/ && $1 || $medium->{with_hdlist};
+ $basename = basename($medium->{with_hdlist});
#- try to sync (copy if needed) local copy after restored the previous one.
$options{force} and unlink "$urpm->{cachedir}/partial/$basename";
@@ -3213,7 +3216,7 @@ sub translate_why_removed {
/unsatisfied/ and do {
foreach (@$whyv) {
$s and $s .= ', ';
- if (/([^\[\s]*)(?:\[\*\])?(?:\[|\s+)([^\]]*)\]?$/) {
+ if (/([^\[\s]*)(?:\[\*\])?(?:\[|\s+)([^\]]*)\]?$/ && $2 ne '*') {
$s .= N("due to unsatisfied %s", "$1 $2");
} else {
$s .= N("due to missing %s", $_);
@@ -3235,10 +3238,11 @@ sub check_sources_signatures {
my ($medium, %invalid_sources);
foreach my $id (sort { $a <=> $b } keys %$sources_install, keys %$sources) {
- my $verif = URPM::verify_rpm($sources_install->{$id} || $sources->{$id});
+ my $filepath = $sources_install->{$id} || $sources->{$id};
+ my $verif = URPM::verify_rpm($filepath);
if ($verif =~ /NOT OK/) {
- $invalid_sources{$sources_install->{$id} || $sources->{$id}} = N("Invalid signature (%s)", $verif);
+ $invalid_sources{$filepath} = N("Invalid signature (%s)", $verif);
} else {
unless ($medium && $medium->{start} <= $id && $id <= $medium->{end}) {
$medium = undef;
@@ -3262,15 +3266,19 @@ sub check_sources_signatures {
}
if ($invalid_ids) {
- $invalid_sources{$sources_install->{$id} || $sources->{$id}} = N("Invalid Key ID (%s)", $verif);
+ $invalid_sources{$filepath} = N("Invalid Key ID (%s)", $verif);
} elsif (!$valid_ids) {
- $invalid_sources{$sources_install->{$id} || $sources->{$id}} = N("Missing signature (%s)", $verif);
+ $invalid_sources{$filepath} = N("Missing signature (%s)", $verif);
}
}
+ #- invoke check signature callback.
+ $options{callback} and $options{callback}->($urpm, $filepath, %options,
+ id => $id, verif => $verif, why => $invalid_sources{$filepath});
}
}
- map { $_ . ($options{translate} ? ": $invalid_sources{$_}" : "") } sort keys %invalid_sources;
+ map { ($options{basename} ? basename($_) : $_) . ($options{translate} ? ": $invalid_sources{$_}" : "") }
+ sort keys %invalid_sources;
}
1;
diff --git a/urpmi.spec b/urpmi.spec
index e8a901f6..b408ca3d 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 4.4
-Release: 31mdk
+Release: 32mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -202,6 +202,12 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
%changelog
+* Fri Sep 5 2003 François Pons <fpons@mandrakesoft.com> 4.4-32mdk
+- fixed symlink in current working directory.
+- added fixes from gc (signature checking improvement and
+ basename usage).
+- fixed bad reason with standalone star in text.
+
* Thu Sep 4 2003 François Pons <fpons@mandrakesoft.com> 4.4-31mdk
- removed obsoleted and no more used -d of urpmi.update.
- fixed --bug to handle local pakcages and virtual media.