Author: glen Date: Fri Feb 25 14:40:00 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- build pkg even source is already updated (for secondary nightly builds)
---- Files affected:
packages/chromium-browser:
update-source.sh (1.20 -> 1.21)
---- Diffs:
================================================================
Index: packages/chromium-browser/update-source.sh
diff -u packages/chromium-browser/update-source.sh:1.20
packages/chromium-browser/update-source.sh:1.21
--- packages/chromium-browser/update-source.sh:1.20 Sat Feb 19 00:31:22 2011
+++ packages/chromium-browser/update-source.sh Fri Feb 25 15:39:55 2011
@@ -59,22 +59,27 @@
newtar=${pkg}_${version}~svn${svndate}r${svnver}.orig.tar.gz
if [ "$newtar" = "$tarball" ]; then
echo "$specfile already up to $newtar"
- exit 0
-fi
-echo "Updating $specfile $to $newtar"
-version=${tarball#${pkg}_} version=${version%~*}
-svndate=${tarball#*svn} svndate=${svndate%%r*}
-svnver=${tarball#${pkg}_${version}~svn${svndate}r} svnver=${svnver%%.*}
-
-sed -i -e "
- s/^\(%define[ \t]\+svnver[ \t]\+\)[0-9]\+\$/\1$svnver/
- s/^\(%define[ \t]\+svndate[ \t]\+\)[0-9]\+\$/\1$svndate/
- s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$version/
-" $specfile
+ # if we don't publish result, there's nothing more to do
+ if [ "$publish_packages" != 1 ]; then
+ exit 0
+ fi
+else
+ echo "Updating $specfile $to $newtar"
+ version=${tarball#${pkg}_} version=${version%~*}
+ svndate=${tarball#*svn} svndate=${svndate%%r*}
+ svnver=${tarball#${pkg}_${version}~svn${svndate}r} svnver=${svnver%%.*}
+
+ sed -i -e "
+ s/^\(%define[ \t]\+svnver[ \t]\+\)[0-9]\+\$/\1$svnver/
+ s/^\(%define[ \t]\+svndate[ \t]\+\)[0-9]\+\$/\1$svndate/
+ s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$version/
+ " $specfile
-../builder -ncs -5 $specfile
+ ../builder -ncs -5 $specfile
+fi
+# if we don't build. we're done
if [ "$build_package" = 0 ]; then
exit 0
fi
@@ -84,8 +89,17 @@
outdir=$(readlink -f $dir)/build-$dist-$arch
logfile=$outdir/$pkg.log
rpmdir=$outdir/RPMS
+rpmdest=~/public_html/chromium-browser/$dist/$arch
install -d $rpmdir
+# if already published?
+if [ "$publish_packages" = 1 ]; then
+ pkg=$rpmdest/$pkg-$version-0.$svnver.$rel.$arch.rpm
+ if [ -f "$pkg" ]; then
+ exit 0
+ fi
+fi
+
# setup custom logfile via $HOME_ETC hack
# TODO: just add --logfile support for builder
cat > $outdir/.builderrc <<-EOF
@@ -110,7 +124,6 @@
exit 1
}
-rpmdest=~/public_html/chromium-browser/$dist/$arch/
if [ "$publish_packages" ] && [ "$(ls $rpmdir/*.rpm 2>/dev/null)" ]; then
install -d $rpmdest
umask 022
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/update-source.sh?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
