From 61c1f2ae2f763b2d487c47c19024aba7188ed69c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 30 Sep 2014 15:38:43 +0200 Subject: xbump: check common/shlibs for changes and commit them too. if the shlibs contain new entries from other packages xbump will fail. --- xbump | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'xbump') 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') -- cgit 1.4.1