diff options
author | Jim Meyering <jim@meyering.net> | 2009-12-04 15:34:41 +0000 |
---|---|---|
committer | Richard Jones <rjones@redhat.com> | 2009-12-07 11:13:12 +0000 |
commit | 9e5fabbe01c0964f7124595beec01dde836d93a6 (patch) | |
tree | efd8460f68ebfce6151f55bb70a17f22369a3e1e | |
parent | cada248a53858341c91f70392e8f5b6e47d9b4fe (diff) | |
download | libguestfs-9e5fabbe01c0964f7124595beec01dde836d93a6.tar.gz libguestfs-9e5fabbe01c0964f7124595beec01dde836d93a6.tar.xz libguestfs-9e5fabbe01c0964f7124595beec01dde836d93a6.zip |
accommodate leading "+" in git submodule output
* cfg.mk (_submodule_hash): Also filter out "+".
* autogen.sh: Likewise.
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | cfg.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -24,7 +24,7 @@ set -v # Ensure that whenever we pull in a gnulib update or otherwise change to a # different version (i.e., when switching branches), we also rerun ./bootstrap. curr_status=.git-module-status -t=$(git submodule status|sed 's/^[ -]//;s/ .*//') +t=$(git submodule status|sed 's/^[ +-]//;s/ .*//') if test "$t" = "$(cat $curr_status 2>/dev/null)"; then : # good, it's up to date else @@ -134,7 +134,7 @@ ifeq (0,$(MAKELEVEL)) # b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda) # $ cat .git-module-status # b653eda3ac4864de205419d9f41eec267cb89eeb - _submodule_hash = sed 's/^[ -]//;s/ .*//' + _submodule_hash = sed 's/^[ +-]//;s/ .*//' _update_required := $(shell \ actual=$$(git submodule status | $(_submodule_hash)); \ stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \ |