Update defaults and kill obsolete mappings

2 files changed, 58 insertions, 47 deletions

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';
diff --git a/ulri b/ulri
index b83b6c7..45d48da 100755
--- a/ulri
+++ b/ulri
@@ -81,13 +81,13 @@ my %config_usage = (
     },
      bot => {  
 	desc => "List of bot able to compile the packages",
-	default => { 
-	    i586 => { 
-	        n1 => { 
+	default => {
+	    i586 => {
+	        localhost => {
 		    iurt => {
-			user => 'mandrake' ,
-			command => 'sudo -u mandrake -H /usr/local/bin/iurt2.sh --copy_srpm --group -v 1 --config local_spool /export/home/mandrake/iurt/__DIR__ --no_rsync --chrooted-urpmi http://kenobi/dis/ -r __TARGET__ __ARCH__',
-			packages => '/export/home/mandrake/iurt/',
+			user => 'builder',
+			command => "iurt --copy_srpm --group --config local_spool /home/builder/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://localhost/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
+			packages => '/home/builder/iurt/',
 		    } ,
 		},
 	    },
@@ -96,35 +96,55 @@ my %config_usage = (
     media => { 
 	desc => 'Corresponding media to add given the current media',
 	default => {
-	    default => { 
-		"main/release" => [ "main/release", "main/updates" ], 
-		"main/updates" => [ "main/release", "main/updates" ],
-		"main/testing" => [ "main/release", "main/updates",
-			"main/testing" ],
-		"main/backports" => [ "main/release", "main/updates",
-			"main/testing", "main/backports" ],
-		"contrib/release" => [ "main/release", "main/updates",
-			"contrib/release", "contrib/updates" ],
-		"contrib/updates" => [ "main/release", "main/updates",
-			"contrib/release", "contrib/updates" ],
-		"contrib/testing" => [ "main/release", "main/updates",
-			"main/testing", "contrib/release", "contrib/updates",
-			"contrib/testing" ],
-		"contrib/backports" => [ "main/release", "main/updates",
-			"main/testing", "main/backports", "contrib/release",
-			"contrib/updates", "contrib/testing",
-			"contrib/backports" ],
-		"non-free/release" => [ "main/release", "main/updates",
-			"non-free/release", "non-free/updates" ],
-		"non-free/updates" => [ "main/release", "main/updates",
-			"non-free/release", "non-free/updates" ],
-		"non-free/testing" => [ "main/release", "main/updates",
-			"main/tessting", "non-free/release",
-			"non-free/updates", "non-free/testing" ],
-		"non-free/backports" => [ "main/release", "main/updates",
-			"main/testing", "main/backports", "non-free/release",
-			"non-free/updates", "non-free/testing",
-			"non-free/backports" ],
+	    default => {
+		"core/backports" => [ "core/backports", "core/release", "core/updates" ],
+		"core/backports_testing" => [
+		    "core/backports", "core/backports_testing",
+		    "core/release", "core/updates"
+		],
+		"core/release" => [ "core/release" ],
+		"core/updates" => [ "core/release", "core/updates" ],
+		"core/updates_testing" => [
+		    "core/release", "core/updates", "core/updates_testing"
+		],
+		"nonfree/backports" => [
+		    "core/backports", "core/release", "core/updates",
+		    "nonfree/backports", "nonfree/release", "nonfree/updates"
+		],
+		"nonfree/backports_testing" => [
+		    "core/backports", "core/backports_testing",
+		    "core/release", "core/updates",
+		    "nonfree/backports", "nonfree/backports_testing",
+		    "nonfree/release", "nonfree/updates"
+		],
+		"nonfree/release" => [ "core/release", "nonfree/release" ],
+		"nonfree/updates" => [
+		    "core/release", "core/updates",
+		    "nonfree/release", "nonfree/updates"
+		],
+		"nonfree/updates_testing" => [
+		    "core/release", "core/updates", "core/updates_testing",
+		    "nonfree/release", "nonfree/updates", "nonfree/updates_testing"
+		],
+		"tainted/backports" => [
+		    "core/backports", "core/release", "core/updates",
+		    "tainted/backports", "tainted/release", "tainted/updates"
+		],
+		"tainted/backports_testing" => [
+		    "core/backports", "core/backports_testing",
+		    "core/release", "core/updates",
+		    "tainted/backports", "tainted/backports_testing",
+		    "tainted/release", "tainted/updates"
+		],
+		"tainted/release" => [ "core/release", "tainted/release" ],
+		"tainted/updates" => [
+		    "core/release", "core/updates",
+		    "tainted/release", "tainted/updates"
+		],
+		"tainted/updates_testing" => [
+		    "core/release", "core/updates", "core/updates_testing",
+		    "tainted/release", "tainted/updates", "tainted/updates_testing"
+		],
 	    },
 	},
     },
@@ -155,7 +175,6 @@ my %config_usage = (
     'arch' => {
 	desc => 'Architectures list for each target',
 	default => {
-	    cauldron => [ 'i586', 'x86_64' ],
 	    default => [ 'i586', 'x86_64' ],
 	},
     },