From 6b2fae8cad48c6541a5f75819d44fa7686b92d5e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 17 Apr 2012 20:50:02 +0000
Subject: (clean_chroot,urpmi_command) factorize/simplify a test

("needed" for next commit)
---
 lib/Iurt/Chroot.pm | 2 +-
 lib/Iurt/Urpmi.pm  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index 870d54f..b40fe41 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -92,7 +92,7 @@ sub clean_chroot {
 
     if ($run->{additional_media} && $run->{additional_media}{repository}) {
 	my $rep = $run->{additional_media}{repository};
-	if ($rep !~ m/^(http:|ftp:)/) {
+	if ($rep !~ m/^(http|ftp):)/) {
 	    my $mount_point = "$chroot/urpmi_medias";
 	    my $url = $rep;
 	    $url =~ s!^file://!!;
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index a70febf..73811bc 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -120,7 +120,7 @@ sub urpmi_command {
 	    $name =~ s![/:]!_!g;
 
 	    my $url;
-	    if ($run->{additional_media}{repository} =~ m!^(http:|ftp:)!) {
+	    if ($run->{additional_media}{repository} =~ m!^(http|ftp):!) {
 		$url = $run->{additional_media}{repository};
 	    }
 	    else {
-- 
cgit v1.2.1