[Pkg-octave-commit] rev 381 - trunk/utils

[Rafael Laboissiere]

Author: rafael
Date: 2005-12-14 19:57:19 +0000 (Wed, 14 Dec 2005)
New Revision: 381

Modified:
   trunk/utils/svn-commit-version
Log:
* Added subroutine dieif
* Use dieif instead of die ... if ... constructs and in the run subroutine 
* Make all sanity checks before running any svn command



Modified: trunk/utils/svn-commit-version
===================================================================
--- trunk/utils/svn-commit-version	2005-12-14 17:49:49 UTC (rev 380)
+++ trunk/utils/svn-commit-version	2005-12-14 19:57:19 UTC (rev 381)
@@ -20,15 +20,18 @@
 die "Usage: $prog [options] svn-dir [build-dir]\n"
   if $#ARGV < 0 or $#ARGV > 1;
 
-my $svndir = $ARGV [0];
+sub dieif {
+  my ($cond, $msg) = @_;
+  die "$prog: $msg" if $cond;
+}      
 
+(my $svndir = $ARGV [0]) =~ s{/+$}{};
+
 my $trunkdir = "$svndir/trunk/packages";
-die "Trunk directory $trunkdir does not exist"
-  if not -d $trunkdir;
+dieif ((not -d $trunkdir), "Trunk directory $trunkdir does not exist");
 
 my $tagsdir = "$svndir/tags/packages";
-die "Tags directory $tagsdir does not exist"
-  if not -d $tagsdir;
+dieif ((not -d $tagsdir), "Tags directory $tagsdir does not exist");
 
 my $buildir = $#ARGV == 1 ? $ARGV [1] : ".";
 
@@ -37,14 +40,15 @@
   if ($dry_run) {
     print "$cmd\n";
   } else {
-    system $cmd;
+    system $cmd
+      or dieif (1, q{Cannot run "} . join (" ", (split (" ", $cmd))[0..1])
+	           . q{" command});
   }
 }
 
 my $debdir = "$buildir/debian";
 
-die "Directory $debdir does not exist"
-  if not -d $debdir;
+dieif ((not -d $debdir), "Directory $debdir does not exist");
 
 open (CHGLOG, "< $debdir/changelog")
   or die "Cannot open $debdir/changelog";
@@ -58,16 +62,15 @@
   }
 }
 
+foreach my $d ($trunkdir, $tagsdir) {
+  dieif ((not -d "$d/$pkgname"), "Directory $d/$pkgname does not exist");
+}
+
 run "svn ci --message=\"Debian release ${pkgname}_$version\" $debdir";
 
-die "Directory $trunkdir/$pkgname does not exist"
-  if not -d "$trunkdir/$pkgname";
 run "svn up $trunkdir/$pkgname";
 
-die "Directory $tagskdir/$pkgname does not exist"
-  if not -d "$tagsdir/$pkgname";
 run "svn cp $trunkdir/$pkgname $tagsdir/$pkgname/$version";
 
-run ("svn ci --message=\"Tagging Debian release ${pkgname}_$version\" "
+run ("svn ci --message=\"Tagged Debian release ${pkgname}_$version\" "
      . "$tagsdir/$pkgname/$version");
-