pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

import-package.sh: Handle new git syntax



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Feb 22 07:22:08 2018 +0100
Changeset:	ce7b51522ede8b4f350919ba3b4ecb6aaa78ea15

Modified Files:
	import-package.sh

Log Message:
import-package.sh: Handle new git syntax

String:
  Your branch is up-to-date
Has been changed to:
  Your branch is up to date

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ce7b51522ede8b4f350919ba3b4ecb6aaa78ea15

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 import-package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diffs:
diff --git a/import-package.sh b/import-package.sh
index e8a7f6ec6e..6fcdcec1cb 100755
--- a/import-package.sh
+++ b/import-package.sh
@@ -86,7 +86,7 @@ if [ "${CATEGORY}" = "wip" ]; then
 	if ! git fetch; then
 	    echo "$0: git fetch failed"
 	fi
-	if ! git status -u no | grep "Your branch is up-to-date" > /dev/null; then
+	if ! git status -u no | egrep "Your branch is (up-to-date|up to date)" > /dev/null; then
 		echo "$0: git repository does not appear to be up to date." 1>&2
 		echo "$0: You should probably run 'git pull --rebase'" 1>&2
 		echo "$0: and 'git push' (if you have unpushed work)" 1>&2


Home | Main Index | Thread Index | Old Index