[software/build-system/iurt] 02/02: 0.6.23

[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 caf0988849a34f08271a1cda56688fc62f453bde
Author: Pascal Terjan <pterjan-***@public.gmane.org>
Date: Sun Oct 12 22:32:08 2014 +0000

0.6.23
---
Commit Link:
http://gitweb.mageia.org/software/build-system/iurt/commit/?id=caf0988849a34f08271a1cda56688fc62f453bde

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

diff --git a/NEWS b/NEWS
index f0c3dfa..8edd1a6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+0.6.23
- remove old src.rpm before recreating it (mga#14243)
- delete potentially incomplete files when copying to local_spool
fails (like when disk is full)
diff --git a/iurt b/iurt
index 1227d29..b8e9e1b 100755
--- a/iurt
+++ b/iurt
@@ -335,7 +335,7 @@ plog_init($program_name, $run{logfd} || $LOG, 7, 1); # For parsing command line

# Display version information
#
-my $version = '0.6.22';
+my $version = '0.6.23';
plog("MSG", "This is iurt version $version");

my $todo = parseCommandLine($program_name, \@ARGV, \@params);

[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 e0663c12dc0dbe367566ba3544b1afa0ee8c965d
Author: Pascal Terjan <pterjan-***@public.gmane.org>
Date: Sun Oct 12 22:31:31 2014 +0000

behave better when local_spool is out of space
---
Commit Link:
http://gitweb.mageia.org/software/build-system/iurt/commit/?id=e0663c12dc0dbe367566ba3544b1afa0ee8c965d

NEWS | 2 ++
iurt | 15 ++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 05b9c8b..f0c3dfa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
- remove old src.rpm before recreating it (mga#14243)
+- delete potentially incomplete files when copying to local_spool
+ fails (like when disk is full)

0.6.22
- don't close stdin if --stop is used (mga#13318)
diff --git a/iurt b/iurt
index 25ea5f2..1227d29 100755
--- a/iurt
+++ b/iurt
@@ -929,15 +929,24 @@ retry:
system("rm -rf $local_spool/log/$srpm/");
} elsif (!$run{discard_packages}) {
plog('OK', "build successful, copying packages to $local_spool.");
-
- system("cp $chroot_tmp/home/$luser/rpmbuild/RPMS/*/*.rpm $local_spool &>/dev/null") and plog('ERROR', "ERROR: could not copy rpm files from $chroot_tmp/home/$luser/rpmbuild/RPMS/ to $local_spool ($!)");
+ if (system("cp $chroot_tmp/home/$luser/rpmbuild/RPMS/*/*.rpm $local_spool &>/dev/null")) {
+ # If copy fails (like disk full), report a failure and delete partially copied files
+ for my $package (@packages) {
+ unlink "$local_spool/$package";
+ }
+ plog('ERROR', "ERROR: could not copy rpm files from $chroot_tmp/home/$luser/rpmbuild/RPMS/ to $local_spool ($!)");
+ }
}

if ($run{copy_srpm}) {
# replace the old srpm
unlink "$local_spool/$old_srpm";

- system("cp $chroot_tmp/home/$luser/rpmbuild/SRPMS/$srpm $local_spool &>/dev/null") and plog('ERROR', "ERROR: could not copy $srpm from $chroot_tmp/home/$luser/rpmbuild/SRPMS/ to $local_spool ($!)");
+ if (system("cp $chroot_tmp/home/$luser/rpmbuild/SRPMS/$srpm $local_spool &>/dev/null")) {
+ # If copy fails (like disk full), remove partially copied file and report a failure
+ unlink "$local_spool/$srpm";
+ plog('ERROR', "ERROR: could not copy $srpm from $chroot_tmp/home/$luser/rpmbuild/SRPMS/ to $local_spool ($!)");
+ }
}
process_queue($config, \%run, \@wrong_rpm, 1);
}