[Pkg-jed-commit] r351 - utils

[Rafael Laboissiere]

Author: rafael
Date: 2006-07-08 08:21:59 +0000 (Sat, 08 Jul 2006)
New Revision: 351

Modified:
   utils/svn-commit-version
Log:
Addapted to new SVN directory layout


Modified: utils/svn-commit-version
===================================================================
--- utils/svn-commit-version	2006-07-08 08:21:31 UTC (rev 350)
+++ utils/svn-commit-version	2006-07-08 08:21:59 UTC (rev 351)
@@ -21,26 +21,8 @@
   if $#ARGV < 0 or $#ARGV > 1;
 
 my $svndir = $ARGV [0];
-
-my $trunkdir = "$svndir/trunk/packages";
-die "Trunk directory $trunkdir does not exist"
-  if not -d $trunkdir;
-
-my $tagsdir = "$svndir/tags/packages";
-die "Tags directory $tagsdir does not exist"
-  if not -d $tagsdir;
-
 my $buildir = $#ARGV == 1 ? $ARGV [1] : ".";
 
-sub run {
-  my $cmd = shift;
-  if ($dry_run) {
-    print "$cmd\n";
-  } else {
-    system $cmd;
-  }
-}
-
 my $debdir = "$buildir/debian";
 
 die "Directory $debdir does not exist"
@@ -58,16 +40,28 @@
   }
 }
 
-run "svn ci --message=\"Debian release ${pkgname}_$version\" $debdir";
+my $trunkdir = "$svndir/$pkgname/trunk";
+die "Trunk directory $trunkdir does not exist"
+  if not -d $trunkdir;
 
-die "Directory $trunkdir/$pkgname does not exist"
-  if not -d "$trunkdir/$pkgname";
-run "svn up $trunkdir/$pkgname";
+my $tagsdir = "$svndir/$pkgname/tags";
+die "Tags directory $tagsdir does not exist"
+  if not -d $tagsdir;
 
-die "Directory $tagskdir/$pkgname does not exist"
-  if not -d "$tagsdir/$pkgname";
-run "svn cp $trunkdir/$pkgname $tagsdir/$pkgname/$version";
+sub run {
+  my $cmd = shift;
+  if ($dry_run) {
+    print "$cmd\n";
+  } else {
+    system $cmd;
+  }
+}
 
+run "svn ci --message=\"Debian release ${pkgname}_$version\" $debdir";
+
+run "svn up $trunkdir";
+run "svn cp $trunkdir $tagsdir/$version";
+
 run ("svn ci --message=\"Tagging Debian release ${pkgname}_$version\" "
-     . "$tagsdir/$pkgname/$version");
+     . "$tagsdir/$version");