aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Leitner <mrl@mandriva.com>2007-06-08 20:11:52 +0000
committerMarcelo Leitner <mrl@mandriva.com>2007-06-08 20:11:52 +0000
commita8ec2f4a2099ab52c86bee8160b90abb3d02634e (patch)
tree27ab7bf7250ddc600d7218925c594c7a4c600cb4
parenteddbbe3687116377bb5852eaa7c55d94cab80086 (diff)
downloadiurt-a8ec2f4a2099ab52c86bee8160b90abb3d02634e.tar
iurt-a8ec2f4a2099ab52c86bee8160b90abb3d02634e.tar.gz
iurt-a8ec2f4a2099ab52c86bee8160b90abb3d02634e.tar.bz2
iurt-a8ec2f4a2099ab52c86bee8160b90abb3d02634e.tar.xz
iurt-a8ec2f4a2099ab52c86bee8160b90abb3d02634e.zip
- Avoid compact perl and free of mistakes.
-rw-r--r--lib/Iurt/Chroot.pm3
-rw-r--r--lib/Iurt/Urpmi.pm3
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index 526263a..9b465de 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -82,7 +82,8 @@ sub clean_chroot {
}
my $mount_point = "$chroot/urpmi_medias/$count";
my $bind;
- my ($url) = $m =~ s!^(http://|ftp://|file://)!!;
+ my ($url) = $m;
+ $url =~ s!^(http://|ftp://|file://)!!;
if (($m =~ m/^(file:)/)) {
$bind = "-o bind";
}
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index f774e48..c004def 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -112,7 +112,8 @@ sub urpmi_command {
my $count = 0;
foreach my $m (@{$run->{additional_media}}) {
- my ($name) = $m =~ s![/:]!_!g;
+ my $name = $m;
+ $name =~ s![/:]!_!g;
my $url;
if (($m =~ m!^(http:|ftp:)!)) {
$url = $m;