[Frugalware-darcs] pacman-tools: rf - die @ darcs || repoman errors

[Zsolt SZALAI]

[rf - die @ darcs || repoman errors
Zsolt SZALAI <xbit at frugalware.org>**20060224220247] {
hunk ./rf 497
+    return $?>>8;
hunk ./rf 520
+    my $exitcode;
hunk ./rf 523
-	msystem $comm;
+	$exitcode = msystem $comm;
hunk ./rf 526
-	msystem $comm;
+	$exitcode = msystem $comm;
hunk ./rf 528
-	msystem getcommand($comm);
+	$exitcode = msystem getcommand($comm);
hunk ./rf 532
-	print "y applay command\na: yes to all further question\ng: give a new command\nq: quit\n\n";
+	print "y apply command\na: yes to all further question\ng: give a new command\nq: quit\n\n";
hunk ./rf 537
+    return $exitcode;
hunk ./rf 595
-  apply "darcs record --edit-long-comment -m '$pkgname-$pkgver-$pkgrel-$arch'" . ($noask? ' -a' : '').(($subg && ($repo ne 'extra')) ? '' : ' .');
+  my $ec = apply "darcs record --edit-long-comment -m '$pkgname-$pkgver-$pkgrel-$arch'" . ($noask? ' -a' : '').(($subg && ($repo ne 'extra')) ? '' : ' .');
+  die "Recording FAILED!\n" if $ec == 1;
hunk ./rf 603
-  apply "darcs push --match 'name $modpkgname'" . ($noask? ' -a' : '');
+  my $ec = apply "darcs push --match 'name $modpkgname'" . ($noask? ' -a' : '');
+  die "Pushing FAILED!\n" if $ec == 1;
hunk ./rf 608
-  print "Uploading source and binary package\n";
-  print "Nothing to do, that's fine!\n\n" unless @sourcefiles;
-  for my $sourcefile (@sourcefiles){
-    apply "repoman up $sourcefile $repo/source/$group/$pkgname/" if $sourcefile;
-  }
-  print "Nothing to do, that's fine!\n\n" unless @pkgfiles;
-  for my $pkgfile (@pkgfiles){
-    apply "repoman up $pkgfile $repo/$repodir/" if $pkgfile;
+    my ($ec,$ev);
+    print "Uploading source and binary package\n";
+    print "Nothing to do, that's fine!\n\n" unless @sourcefiles;
+    for my $sourcefile (@sourcefiles){
+	$ec = apply "repoman up $sourcefile $repo/source/$group/$pkgname/" if $sourcefile;
+    }
+    print "Nothing to do, that's fine!\n\n" unless @pkgfiles;
+    for my $pkgfile (@pkgfiles){
+	$ev = apply "repoman up $pkgfile $repo/$repodir/" if $pkgfile;
hunk ./rf 618
+    die "Uploading FAILED!" if $ev || $ec;
hunk ./rf 624
-  apply "arch=$arch repoman cl $repo$group/$pkgname";
+  my $ec = apply "arch=$arch repoman cl $repo$group/$pkgname";
+  die "Changelog not generated!" if $ec;
hunk ./rf 629
+  my ($ec,$ev);
hunk ./rf 639
-	  apply "repoman del $repo/source/$group/$pkgname/$ir";}}}
+	  $ec = apply "repoman del $repo/source/$group/$pkgname/$ir";}}}
hunk ./rf 647
-	  apply "repoman del $repo/$repodir/$oldf";}}}}
+	  $ev = apply "repoman del $repo/$repodir/$oldf";}}}}
+  die "Cleaning up FAILED!" if $ec||$ev;
}