packages: chromium-browser/update-source.sh - fix autobuild to resume on .s...

[glen]

Author: glen                         Date: Thu Dec  2 08:09:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix autobuild to resume on .spec file conflicts

---- Files affected:
packages/chromium-browser:
   update-source.sh (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/chromium-browser/update-source.sh
diff -u packages/chromium-browser/update-source.sh:1.15 packages/chromium-browser/update-source.sh:1.16
--- packages/chromium-browser/update-source.sh:1.15	Wed Oct 13 10:30:54 2010
+++ packages/chromium-browser/update-source.sh	Thu Dec  2 09:09:02 2010
@@ -48,6 +48,9 @@
 pkg=chromium-browser
 specfile=$pkg.spec
 
+# cvs up specfile, rename in case of conflicts
+cvs up $specfile || { set -x; mv -b $specfile $specfile.old && cvs up $specfile; }
+
 svndate=$(awk '/^%define[ 	]+svndate[ 	]+/{print $NF}' $specfile)
 svnver=$(awk '/^%define[ 	]+svnver[ 	]+/{print $NF}' $specfile)
 version=$(awk '/^Version:[ 	]+/{print $NF}' $specfile)
@@ -65,9 +68,6 @@
 		s/^\(%define[ \t]\+svndate[ \t]\+\)[0-9]\+\$/\1$svndate/
 		s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$version/
 	" $specfile
-
-	# cvs up specfile, rename in case of conflicts
-	cvs up $specfile || mv -b $specfile $specfile.old
 
 	../builder -ncs -5 $specfile
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/update-source.sh?r1=1.15&r2=1.16&f=u