summaryrefslogtreecommitdiffstats
path: root/urpm/media.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-06 19:43:44 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-06 19:43:44 +0000
commit1c44e4e5600ee7b981f6b5c8a0181e5323d50dbb (patch)
treec5be614f327a245cde0840d50b8fdfacf2d7529c /urpm/media.pm
parent1fd8be50f3a52993761b92ba90cdecc04825da37 (diff)
downloadurpmi-1c44e4e5600ee7b981f6b5c8a0181e5323d50dbb.tar
urpmi-1c44e4e5600ee7b981f6b5c8a0181e5323d50dbb.tar.gz
urpmi-1c44e4e5600ee7b981f6b5c8a0181e5323d50dbb.tar.bz2
urpmi-1c44e4e5600ee7b981f6b5c8a0181e5323d50dbb.tar.xz
urpmi-1c44e4e5600ee7b981f6b5c8a0181e5323d50dbb.zip
perl_checker cleanups
Diffstat (limited to 'urpm/media.pm')
-rw-r--r--urpm/media.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index d475c7b5..6195e2df 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -793,13 +793,13 @@ sub find_zeroconf_repository {
my $path_suffix = join('/', lc($product_id->{branch}), $product_id->{version}, $product_id->{arch});
foreach my $entry ($res->entries) {
- my $base_url = $entry->attribute('protocol') . '://' .$entry->address . ':' . $entry->port . $entry->attribute('path');
+ my $base_url = $entry->attribute('protocol') . '://' . $entry->address . ':' . $entry->port . $entry->attribute('path');
my $url = $base_url . '/' . $path_suffix;
my $distribconf = _new_distribconf_and_download($urpm, { url => $url });
if ($distribconf) {
$urpm->{log}(sprintf("found zeroconf repository: %s", $url));
return $url;
- };
+ }
}
$urpm->{debug} and $urpm->{debug}("unable to find zeroconf repository");
@@ -896,7 +896,7 @@ sub _register_media_cfg {
my $version = $distribconf->getvalue('media_info', 'version') || '';
#official mirrors define $branch but not $product, other RPM repos do the
#opposite :-/
- my $media_dir = (($branch or $product) . '-' . $version . '-' . $arch);
+ my $media_dir = (($branch || $product) . '-' . $version . '-' . $arch);
$media_dir =~ tr!/!-!;
my $media_path = $urpm->{mediacfgdir} . '/' . $media_dir;
require File::Path;