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

[Rafael Laboissiere]

Author: rafael
Date: 2006-08-15 19:19:48 +0000 (Tue, 15 Aug 2006)
New Revision: 696

Modified:
   trunk/utils/svn-commit-version
Log:
Make option --package work, really


Modified: trunk/utils/svn-commit-version
===================================================================
--- trunk/utils/svn-commit-version	2006-08-15 19:19:10 UTC (rev 695)
+++ trunk/utils/svn-commit-version	2006-08-15 19:19:48 UTC (rev 696)
@@ -8,7 +8,7 @@
 my $version;
 my $dry_run = 0;
 
-GetOptions ("package=s" => \$pkgname,
+GetOptions ("package=s" => \$trunkname,
             "dry-run"  => \$dry_run,
             "help" => \$help);
 
@@ -55,22 +55,21 @@
 
 while (<CHGLOG>) {
   if (/^(\S+) \(([^)]+)\)/) {
-    $pkgname = $1
-      if not defined $pkgname;
+    $pkgname = $1;
     $version = $2;
     last;
   }
 }
 
-foreach my $d ($trunkdir, $tagsdir) {
-  dieif ((not -d "$d/$pkgname"), "Directory $d/$pkgname does not exist");
+foreach my $d ("$trunkdir/$trunkname", "$tagsdir/$pkgname") {
+  dieif ((not -d $d), "Directory $d/$pkgname does not exist");
 }
 
 run "svn ci --message=\"Debian release ${pkgname}_$version\" $debdir";
 
-run "svn up $trunkdir/$pkgname";
+run "svn up $trunkdir/$trunkname";
 
-run "svn cp $trunkdir/$pkgname $tagsdir/$pkgname/$version";
+run "svn cp $trunkdir/$trunkname $tagsdir/$pkgname/$version";
 
 run ("svn ci --message=\"Tagged Debian release ${pkgname}_$version\" "
      . "$tagsdir/$pkgname/$version");