From 2aef19c4c0fd38641ccc54bd5946dd3103743749 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 3 Sep 2008 12:51:00 +0000
Subject: - create _synthesis_dir_rel() out of _synthesis_dir() - fix typo in
 previous commit

---
 urpm/media.pm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'urpm')

diff --git a/urpm/media.pm b/urpm/media.pm
index 3cb58a5d..f23e2780 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -282,14 +282,20 @@ sub _url_with_synthesis_basename {
       ? basename($medium->{with_synthesis})
       : 'synthesis.hdlist.cz';
 }
-sub _synthesis_dir {
+sub _synthesis_dir_rel {
     my ($medium) = @_;
     $medium->{'no-media-info'} || $medium->{unknown_media_info} and return;
 
-    my $base = file_from_local_medium($medium) || $medium->{url};
     $medium->{with_synthesis}
-      ? reduce_pathname("$base/$medium->{with_synthesis}/..")
-      : $medium->{media_info_dir} && reduce_pathname("$base/$medium->{media_info_dir}");
+      ? "$medium->{with_synthesis}/.."
+      : $medium->{media_info_dir};
+}
+sub _synthesis_dir {
+    my ($medium) = @_;
+    my $rel = _synthesis_dir_rel($medium);
+
+    my $base = file_from_local_medium($medium) || $medium->{url};
+    reduce_pathname("$base/$rel");
 }
 
 # the difference between _valid_synthesis_dir and _synthesis_dir
@@ -1014,7 +1020,7 @@ sub may_reconfig_urpmi {
 	$f = reduce_pathname("$dir/reconfig.urpmi");
     } else {
 	unlink($f = "$urpm->{cachedir}/partial/reconfig.urpmi");
-	urpm::download::sync_rel($urpm, $medium, 'reconfig.urpmi') ], quiet => 1);
+	urpm::download::sync_rel($urpm, $medium, [ 'reconfig.urpmi' ], quiet => 1);
     }
     if (-s $f) {
 	reconfig_urpmi($urpm, $f, $medium);
-- 
cgit v1.2.1