summary refs log tree commit diff
diff options
context:
space:
mode:
authorEnno Boland <g@s01.de>2014-09-30 15:38:43 +0200
committerChristian Neukirchen <chneukirchen@gmail.com>2014-10-10 16:44:40 +0200
commit61c1f2ae2f763b2d487c47c19024aba7188ed69c (patch)
treec4dafcba5b5103472d3fe57131dccbddee0a5628
parent01453be0f1cdfbbac1eb2a99991bfa1958537b98 (diff)
downloadxtools-61c1f2ae2f763b2d487c47c19024aba7188ed69c.tar.gz
xtools-61c1f2ae2f763b2d487c47c19024aba7188ed69c.tar.xz
xtools-61c1f2ae2f763b2d487c47c19024aba7188ed69c.zip
xbump: check common/shlibs for changes and commit them too.
if the shlibs contain new entries from other packages xbump will fail.
-rwxr-xr-xxbump10
1 files changed, 10 insertions, 0 deletions
diff --git a/xbump b/xbump
index 8055452..9de5833 100755
--- a/xbump
+++ b/xbump
@@ -13,6 +13,16 @@ else
 	msg="New package: $pkg-$version"
 fi
 
+spkpattern=`xsubpkg "$pkg" | tr '\n' '|' | sed 's/\(.*\)|/^(\1)$/'`
+shlibs=`git diff common/shlibs | grep "^+[^+]" | \
+	sed "s/^+[^ ]\+ \(.*\)-[^-]\+_[0-9]\+$/\1/"`
+if [ -n "`echo "$shlibs" | grep -vE "$spkpattern"`" ]; then
+	echo "common/shlibs contains uncommitted changes for other packages." 2>&1
+	exit 1
+elif [ -n "$shlibs" ]; then
+	git add common/shlibs
+fi
+
 dirs=$(./xbps-src show "$pkg" |
 	sed -n '/^\(pkgname\|subpackage\)/s/[^:]*:[\t]*/srcpkgs\//p')