packages: chromium-browser/update-source.sh - cvs up specfile, rename in ca...

[glen]

Author: glen                         Date: Wed Oct 13 08:30:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cvs up specfile, rename in case of conflicts

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

---- Diffs:

================================================================
Index: packages/chromium-browser/update-source.sh
diff -u packages/chromium-browser/update-source.sh:1.14 packages/chromium-browser/update-source.sh:1.15
--- packages/chromium-browser/update-source.sh:1.14	Sun Jun 13 09:17:34 2010
+++ packages/chromium-browser/update-source.sh	Wed Oct 13 10:30:54 2010
@@ -65,6 +65,10 @@
 		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
 
 	if [ "$build_package" != 0 ]; then
================================================================

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