Author: baggins Date: Thu Jul 29 22:16:31 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel may contain other macros, strip and readd them for increment
---- Files affected:
packages:
relup.sh (1.22 -> 1.23)
---- Diffs:
================================================================
Index: packages/relup.sh
diff -u packages/relup.sh:1.22 packages/relup.sh:1.23
--- packages/relup.sh:1.22 Fri Jan 29 20:58:46 2010
+++ packages/relup.sh Fri Jul 30 00:16:25 2010
@@ -102,8 +102,15 @@
fi
rel=$(get_release "$spec")
if [ "$inc" = 1 ]; then
- newrel=$(expr $rel + 1)
- set_release "$spec" $rel $newrel
+ if [[ $rel = *%* ]]; then
+ relmacro=${rel#*%}
+ relnum=${rel%%%*}
+ newrel=$(expr ${relnum} + 1)
+ set_release "$spec" $rel "${newrel}%${relmacro}"
+ else
+ newrel=$(expr ${rel} + 1)
+ set_release "$spec" $rel $newrel
+ fi
# refetch release
rel=$(get_release "$spec")
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/relup.sh?r1=1.22&r2=1.23&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
