summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-04-28 07:46:19 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-04-28 07:46:19 +0000
commitdc891fc82eae5a3408e840589a736b23787e38c5 (patch)
tree656b2d2046d5423949429f2fdfce7122be30b69a
parentf24a0ba7c810ede736a049e27934e4f833eab3ad (diff)
downloadurpmi-dc891fc82eae5a3408e840589a736b23787e38c5.tar
urpmi-dc891fc82eae5a3408e840589a736b23787e38c5.tar.gz
urpmi-dc891fc82eae5a3408e840589a736b23787e38c5.tar.bz2
urpmi-dc891fc82eae5a3408e840589a736b23787e38c5.tar.xz
urpmi-dc891fc82eae5a3408e840589a736b23787e38c5.zip
Cleanup some perl warnings
-rw-r--r--urpm.pm7
-rw-r--r--urpm/util.pm1
2 files changed, 5 insertions, 3 deletions
diff --git a/urpm.pm b/urpm.pm
index aa2b3ec6..2a476e4d 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -231,7 +231,8 @@ sub read_config {
while (<MD5SUM>) {
my ($md5sum, $file) = /(\S*)\s+(.*)/;
foreach (@{$urpm->{media}}) {
- ($_->{synthesis} && "synthesis.").$_->{hdlist} eq $file and $_->{md5sum} = $md5sum, last;
+ ($_->{synthesis} ? "synthesis." : "").$_->{hdlist} eq $file
+ and $_->{md5sum} = $md5sum, last;
}
}
close MD5SUM;
@@ -1575,8 +1576,8 @@ this could happen if you mounted manually the directory when creating the medium
}
} else {
#- the flag is no more necessary.
- delete $medium->{list};
- unlink "$urpm->{statedir}/$medium->{list}";
+ delete $medium->{list}
+ and unlink "$urpm->{statedir}/$medium->{list}";
}
}
}
diff --git a/urpm/util.pm b/urpm/util.pm
index cbfcb06b..01121284 100644
--- a/urpm/util.pm
+++ b/urpm/util.pm
@@ -19,6 +19,7 @@ sub reduce_pathname {
#- clean url to remove any macro (which cannot be solved now).
#- take care if this is a true url and not a simple pathname.
my ($host, $dir) = $url =~ m|([^:/]*://[^/]*/)?(.*)|;
+ $host = '' if !defined $host;
#- remove any multiple /s or trailing /.
#- then split all components of pathname.