From 052012580a20824dd097cc46882e57bb2d9211d3 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@google.com>
Date: Sat, 18 Jan 2014 20:47:00 -0800
Subject: Update defaults and kill obsolete mappings

---
 iurt | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'iurt')

diff --git a/iurt b/iurt
index 147ebd0..013fc03 100755
--- a/iurt
+++ b/iurt
@@ -98,8 +98,8 @@ $run{todo} = [];
 	    [--repository <distribution path>]
 	    [--rpmmacros <macro definition> [<macro definition>...]]
 	    {--config_help}
-	    --chroot --arch {i586|x86_64|ppc} --distro {cauldron|2006.0|community/2006.0|...} } |
- 	    --build-user <user> --rebuild {cauldron|2006.0|community/2006.0|...} {i586|x86_64|ppc|...} {filename1.src.rpm} {filename2.src.rpm} ... {filenamen.src.rpm} }", 
+	    --chroot --arch {i586|x86_64|ppc} --distro {cauldron|...} } |
+	    --build-user <user> --rebuild {cauldron|...} {i586|x86_64|ppc|...} {filename1.src.rpm} {filename2.src.rpm} ... {filenamen.src.rpm} }",
     "$program_name is a perl script to rebuild automatically several rpm in chroot, given a sourcerpm repository, and mail authors or rebuilder when problems occurs.
 
 		e.g.: iurt --repository /dis/ -p foo\@foo.net -r cauldron x86_64  /SRPMS/main/release/mkcd-4.2.5-1mdv2007.1.src.rpm", 
@@ -542,15 +542,7 @@ if ($config->{env}) {
     }
 }
 
-$config->{upload} .= $run{distro};
-$config->{upload} =~ s/community//g;
-if ($run{distro} ne 'cauldron') {
-    if ($run{media} ne 'main') {
-	$config->{upload} .= "/$run{media}";
-    }
-} elsif ($run{media} eq 'contrib') {
-    $config->{upload} =~ s/cauldron/contrib/g;
-}
+$config->{upload} .= "$run{distro}/$run{media}";
 
 if ($run{icecream}) {
     push $config->{basesystem_packages}, 'icecream';
-- 
cgit v1.2.1