diff options
| author | Pascal Terjan <pterjan@google.com> | 2014-01-18 20:47:00 -0800 |
|---|---|---|
| committer | Pascal Terjan <pterjan@gmail.com> | 2014-01-19 05:13:33 +0000 |
| commit | 052012580a20824dd097cc46882e57bb2d9211d3 (patch) | |
| tree | 6b27de02adfe72fca17396af686af88582799efe /iurt | |
| parent | e2dbc62ae6f8a09f1687aa476e3e28fd2b787c4b (diff) | |
| download | iurt-052012580a20824dd097cc46882e57bb2d9211d3.tar iurt-052012580a20824dd097cc46882e57bb2d9211d3.tar.gz iurt-052012580a20824dd097cc46882e57bb2d9211d3.tar.bz2 iurt-052012580a20824dd097cc46882e57bb2d9211d3.tar.xz iurt-052012580a20824dd097cc46882e57bb2d9211d3.zip | |
Update defaults and kill obsolete mappings
Diffstat (limited to 'iurt')
| -rwxr-xr-x | iurt | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -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'; |