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

[pere at alioth.debian.org]

Author: pere
Date: 2014-07-06 21:24:46 +0000 (Sun, 06 Jul 2014)
New Revision: 83482

Modified:
   trunk/src/build/CD-administrator/patch-debian-cd
Log:
Try to fix git update code for master branch.

Modified: trunk/src/build/CD-administrator/patch-debian-cd
===================================================================
--- trunk/src/build/CD-administrator/patch-debian-cd	2014-07-06 20:08:12 UTC (rev 83481)
+++ trunk/src/build/CD-administrator/patch-debian-cd	2014-07-06 21:24:46 UTC (rev 83482)
@@ -52,7 +52,11 @@
 	git clone $gitpath debian-cd.unpatched.$svntarget
 	(cd debian-cd.unpatched.$svntarget; git checkout $gitrev)
 else
-	(cd debian-cd.unpatched.$svntarget; git fetch; git checkout $gitrev)
+	if [ "master = "$gitrev" ] ; then
+		(cd debian-cd.unpatched.$svntarget; git fetch; git checkout $gitrev; git pull)
+	else
+		(cd debian-cd.unpatched.$svntarget; git fetch; git checkout $gitrev)
+	fi
 fi
 
 rm -rf debian-cd.new