This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch master in repository devscripts.
commit 056af6f6838610f072b2268d9bb6cddbbe772d00 Author: Osamu Aoki <os...@debian.org> Date: Fri Mar 4 20:59:50 2016 +0900 test_uscan: Fix failure on Rasbian Also updated uupdate.sh for cleaner code This fixes #816645 --- debian/changelog | 2 ++ scripts/uupdate.sh | 8 +++----- test/test_uscan | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2036c09..8a61001 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ devscripts (2.16.2) UNRELEASED; urgency=medium tests. + Reactivate --no-verbose mode. Closes: #815645 + Fix --destdir for version 4. Closes:#814686 + * test_uscan: + + Fix non-{Debian,Ubuntu} cases. Closes: #816645 [ Dominique Dumont ] * licensecheck: diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh index de47614..b1f46af 100755 --- a/scripts/uupdate.sh +++ b/scripts/uupdate.sh @@ -136,16 +136,14 @@ DEFAULT_UUPDATE_ROOTCMD= DEFAULT_UUPDATE_PRISTINE=yes DEFAULT_UUPDATE_SYMLINK_ORIG=yes VARS="UUPDATE_ROOTCMD UUPDATE_PRISTINE UUPDATE_SYMLINK_ORIG" -SUFFIX="1" +SUFFIX="1" if which dpkg-vendor >/dev/null 2>&1; then VENDER="$(dpkg-vendor --query Vendor 2>/dev/null|tr 'A-Z' 'a-z')" case "$VENDER" in - debian) SUFFIX="1" ;; - *) SUFFIX="0${VENDER}1" ;; + debian) SUFFIX="1" ;; + *) SUFFIX="0${VENDER}1" ;; esac -else - SUFFIX="1" fi if [ "$1" = "--no-conf" -o "$1" = "--noconf" ]; then diff --git a/test/test_uscan b/test/test_uscan index 33a26f2..aabdadd 100755 --- a/test/test_uscan +++ b/test/test_uscan @@ -19,10 +19,10 @@ test_dir=$(readlink -f "${0%/*}") SUFFIX="1" if which dpkg-vendor >/dev/null 2>&1; then - case "$(dpkg-vendor --query Vendor 2>/dev/null)" in - "Ubuntu") - SUFFIX="0ubuntu1" - ;; + VENDER="$(dpkg-vendor --query Vendor 2>/dev/null|tr 'A-Z' 'a-z')" + case "$VENDER" in + debian) SUFFIX="1" ;; + *) SUFFIX="0${VENDER}1" ;; esac fi -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list devscripts-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel