[debian-edu-commits] r80120 - trunk/src/build/CD-administrator

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-17 20:22:22 +0000 (Fri, 17 May 2013)
New Revision: 80120

Modified:
   trunk/src/build/CD-administrator/debian-cd.patch.nolocal
   trunk/src/build/CD-administrator/patch-debian-cd
Log:
Try to get testing nolocal build working.

Modified: trunk/src/build/CD-administrator/debian-cd.patch.nolocal
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.nolocal	2013-05-17 19:56:48 UTC (rev 80119)
+++ trunk/src/build/CD-administrator/debian-cd.patch.nolocal	2013-05-17 20:22:22 UTC (rev 80120)
@@ -1,6 +1,6 @@
-diff -ur debian-cd.unpatched.trunk/tasks/squeeze/exclude debian-cd/tasks/squeeze/exclude
---- debian-cd.unpatched.trunk/tasks/squeeze/exclude	2007-11-25 11:32:14.000000000 +0100
-+++ debian-cd/tasks/squeeze/exclude	2007-12-12 20:59:05.000000000 +0100
+diff -ur debian-cd.unpatched.trunk/tasks/jessie/exclude debian-cd/tasks/jessie/exclude
+--- debian-cd.unpatched.trunk/tasks/jessie/exclude	2007-11-25 11:32:14.000000000 +0100
++++ debian-cd/tasks/jessie/exclude	2007-12-12 20:59:05.000000000 +0100
 @@ -1,1 +1,2 @@
  acorn-fdisk
 +#include <debian-edu-exclude>

Modified: trunk/src/build/CD-administrator/patch-debian-cd
===================================================================
--- trunk/src/build/CD-administrator/patch-debian-cd	2013-05-17 19:56:48 UTC (rev 80119)
+++ trunk/src/build/CD-administrator/patch-debian-cd	2013-05-17 20:22:22 UTC (rev 80120)
@@ -3,6 +3,8 @@
 # existing checkout of debian-cd, or a fresh checkout.
 set -e
 
+svnrev="-r $(cat debian-cd-revision)"
+
 case $1 in
   sarge*|etch*)
     svntarget="etch"
@@ -30,6 +32,7 @@
     svntarget="trunk"
     patchsource="nolocal"
     svnpath=svn://svn.debian.org/debian-cd/trunk
+    svnrev=""
     ;;
   *)
     svntarget="trunk"
@@ -41,9 +44,9 @@
 
 if [ ! -d debian-cd.unpatched.$svntarget ]; then
 	echo "Fetching debian-cd from svn."
-	svn co -r `cat debian-cd-revision` $svnpath debian-cd.unpatched.$svntarget
+	svn co $svnrev $svnpath debian-cd.unpatched.$svntarget
 else
-	svn update -r `cat debian-cd-revision` debian-cd.unpatched.$svntarget
+	svn update $svnrev debian-cd.unpatched.$svntarget
 fi
 
 rm -rf debian-cd.new