[software/build-system/iurt] 04/05: Enhance readability of --config-help output: remove leading spaces.

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

pterjan pushed a commit to branch master
in repository software/build-system/iurt.

commit e466557e13a03fc2f85a0f0f8941d9dbd6ea8e76
Author: Hartmut Goebel <h.goebel-***@public.gmane.org>
Date: Tue Mar 25 18:19:18 2014 +0100

Enhance readability of --config-help output: remove leading spaces.
---
Commit Link:
http://gitweb.mageia.org/software/build-system/iurt/commit/?id=e466557e13a03fc2f85a0f0f8941d9dbd6ea8e76

lib/Iurt/Config.pm | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/Iurt/Config.pm b/lib/Iurt/Config.pm
index c793cba..8426b03 100644
--- a/lib/Iurt/Config.pm
+++ b/lib/Iurt/Config.pm
@@ -47,16 +47,13 @@ Return true.

sub config_usage {
my ($config_usage, $config) = @_;
- print "
-
- Iurt configuration keywords:
-
-";
+ print "\nIurt configuration keywords:\n\n";
$Data::Dumper::Indent = 0;
$Data::Dumper::Terse = 1;
foreach my $k (sort keys %$config_usage) {
- print " $k: $config_usage->{$k}{desc}
- default: ", Data::Dumper->Dump([ $config_usage->{$k}{default} ]), ", current: ", Data::Dumper->Dump([ $config->{$k} ]), "\n";
+ print (" $k: $config_usage->{$k}{desc}\n\t\tdefault: ",
+ Data::Dumper->Dump([ $config_usage->{$k}{default} ]),
+ ", current: ", Data::Dumper->Dump([ $config->{$k} ]), "\n");
}
print "\n\n";
}

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

pterjan pushed a commit to branch master
in repository software/build-system/iurt.

commit 8d00c2ff108e09fb9873c0fdd63eb76b16b5d7a4
Author: Hartmut Goebel <h.goebel-***@public.gmane.org>
Date: Tue Mar 25 18:00:15 2014 +0100

Fix: missing parameters for call of config_usage().
---
Commit Link:
http://gitweb.mageia.org/software/build-system/iurt/commit/?id=8d00c2ff108e09fb9873c0fdd63eb76b16b5d7a4

iurt | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/iurt b/iurt
index 013fc03..61ef2b1 100755
--- a/iurt
+++ b/iurt
@@ -527,8 +527,7 @@ my %config_usage = (
},
);

-# FIXME: missing parameters
-config_usage() if $run{config_usage};
+config_usage(\%config_usage, $config) if $run{config_usage};
$run{my_arch} or usage($program_name, \@params, "no architecture given (media $run{media}, run{my_arch} $run{my_arch}, todo", join(', ', @{$run{todo}}));
if (!$arch_comp{$real_arch}{$run{my_arch}}) {
die "FATAL $program_name: could not compile $run{my_arch} binaries on a $real_arch";

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

pterjan pushed a commit to branch master
in repository software/build-system/iurt.

commit b52260abf811704d8f8fb824c8218f54b2fd9cb1
Author: Pascal Terjan <pterjan-***@public.gmane.org>
Date: Tue Mar 25 22:37:49 2014 +0000

Allow using --config-help with no repository configured
---
Commit Link:
http://gitweb.mageia.org/software/build-system/iurt/commit/?id=b52260abf811704d8f8fb824c8218f54b2fd9cb1

iurt | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/iurt b/iurt
index c3ff175..b12405e 100755
--- a/iurt
+++ b/iurt
@@ -372,17 +372,6 @@ if ($run{repository}) {
$config->{repository} = $run{repository};
}

-if (!$config->{repository}) {
- die "FATAL $program_name: no repository have been defined (use --repository to specify one on the command line";
-}
-
-my $urpmi = Iurt::Urpmi->new(run => \%run, config => $config, urpmi_options => "-v --no-verify-rpm --nolock --auto --no-suggests --ignoresize $config->{urpmi_options}");
-$run{urpmi} = $urpmi;
-
-if (!$run{chrooted_urpmi} && $run{group}) {
- die "FATAL $program_name: option --chrooted-urpmi is mandatory if --group is selected";
-}
-
my %config_usage = (
admin => {
desc => 'Mail of the administrator of packages builds',
@@ -531,6 +520,18 @@ if ($run{config_usage}) {
config_usage(\%config_usage, $config);
exit;
};
+
+if (!$config->{repository}) {
+ die "FATAL $program_name: no repository have been defined (use --repository to specify one on the command line";
+}
+
+my $urpmi = Iurt::Urpmi->new(run => \%run, config => $config, urpmi_options => "-v --no-verify-rpm --nolock --auto --no-suggests --ignoresize $config->{urpmi_options}");
+$run{urpmi} = $urpmi;
+
+if (!$run{chrooted_urpmi} && $run{group}) {
+ die "FATAL $program_name: option --chrooted-urpmi is mandatory if --group is selected";
+}
+
$run{my_arch} or usage($program_name, \@params, "no architecture given (media $run{media}, run{my_arch} $run{my_arch}, todo", join(', ', @{$run{todo}}));
if (!$arch_comp{$real_arch}{$run{my_arch}}) {
die "FATAL $program_name: could not compile $run{my_arch} binaries on a $real_arch";

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

pterjan pushed a commit to branch master
in repository software/build-system/iurt.

commit 94631922a00ce60bb3bd4b7626fa2a23acf0e894
Author: Hartmut Goebel <h.goebel-***@public.gmane.org>
Date: Tue Mar 25 18:06:36 2014 +0100

Fix some errors in usage.
---
Commit Link:
http://gitweb.mageia.org/software/build-system/iurt/commit/?id=94631922a00ce60bb3bd4b7626fa2a23acf0e894

iurt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/iurt b/iurt
index 5c36bae..c3ff175 100755
--- a/iurt
+++ b/iurt
@@ -97,8 +97,8 @@ $run{todo} = [];
[--upload [--markrelease] [--source]] [--dir] [--help foo?] [--log filename] [--status]
[--repository <distribution path>]
[--rpmmacros <macro definition> [<macro definition>...]]
- {--config_help}
- --chroot --arch {i586|x86_64|ppc} --distro {cauldron|...} } |
+ {--config-help}
+ --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.

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

pterjan pushed a commit to branch master
in repository software/build-system/iurt.

commit 9c65b2f0df474746e78c50bec428c6ef34fe93e6
Author: Hartmut Goebel <h.goebel-***@public.gmane.org>
Date: Tue Mar 25 18:05:13 2014 +0100

Fix: Stop processing after printing config-help.

Only if --config-help is given, of course.
---
Commit Link:
http://gitweb.mageia.org/software/build-system/iurt/commit/?id=9c65b2f0df474746e78c50bec428c6ef34fe93e6

iurt | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/iurt b/iurt
index 61ef2b1..5c36bae 100755
--- a/iurt
+++ b/iurt
@@ -527,7 +527,10 @@ my %config_usage = (
},
);

-config_usage(\%config_usage, $config) if $run{config_usage};
+if ($run{config_usage}) {
+ config_usage(\%config_usage, $config);
+ exit;
+};
$run{my_arch} or usage($program_name, \@params, "no architecture given (media $run{media}, run{my_arch} $run{my_arch}, todo", join(', ', @{$run{todo}}));
if (!$arch_comp{$real_arch}{$run{my_arch}}) {
die "FATAL $program_name: could not compile $run{my_arch} binaries on a $real_arch";