This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch master in repository devscripts.
commit 07ad51381e203ac1d8336e4292570a864dd1b3ae Author: Osamu Aoki <[email protected]> Date: Sun Aug 27 05:00:30 2017 +0900 test_uscan_mangle: pgpmode=previous Confirms functioning of pgpmode=previous --- test/test_uscan_mangle | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/test_uscan_mangle b/test/test_uscan_mangle index 101583f..f93ae4f 100755 --- a/test/test_uscan_mangle +++ b/test/test_uscan_mangle @@ -36,6 +36,7 @@ DEBUGLSLR=":" DEBUGBASH=":" # comment out for debug #COMMAND="$COMMAND --debug" +#COMMAND="$COMMAND --verbose" #DEBUGECHO=echo #DEBUGLSLR="ls -laR" #DEBUGLSLR="ls -la" @@ -324,6 +325,9 @@ helperWatch() { if grep -q "pgpurlmangle" $TMPDIR/${PKG}/debian/watch ; then PGP=pgp fi + if grep -q "pgpmode=previous" $TMPDIR/${PKG}/debian/watch ; then + PGP=pgp + fi $XCOMMAND assertEquals "uscan: exit_code!=0 but exit_code=0" "$?" "0" cd $TMPDIR @@ -334,7 +338,7 @@ helperWatch() { assertTrue "$STARBALL missing: $WATCHLINE" "[ -f $STARBALL ]" if [ "$PGP" = "pgp" ]; then UTARSIG=${PKG}-${VERNEW}.tar.gz.sig - if [ -f $UTARSIG ]; then + if [ ! -f $UTARSIG ]; then UTARSIG=${PKG}-${VERNEW}.tar.gz.asc fi STARSUG=${PKG}_${PREFIX}${VERNEW}.orig.tar.$GZREPACK.asc @@ -348,7 +352,7 @@ helperWatch() { assertTrue "$STARBALL missing: $WATCHLINE" "[ -f $STARBALL ]" if [ "$PGP" = "pgp" ]; then UTARSIG=${cpnt}-${VERNEW}.tar.gz.sig - if [ -f $UTARSIG ]; then + if [ ! -f $UTARSIG ]; then UTARSIG=${cpnt}-${VERNEW}.tar.gz.asc fi STARSUG=${PKG}_${PREFIX}${VERNEW}.orig-${cpnt}.tar.$GZREPACK.asc @@ -986,6 +990,15 @@ opts = "pgpmode=previous" @@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@. helperWatch siteWebNonNativeR } +# test normal web page with sig (different file path for sig and tar; reverse order, BIN) +testWatch4WebNonNativeRSigBIN() { + WATCHVER=4 + SIGMODE=BIN + WATCHLINE='opts = "pgpmode=next" @@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian +opts = "pgpmode=previous" @@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@[email protected] previous uupdate' + helperWatch siteWebNonNativeR +} + # test normal web page with sig (self) testWatch4WebNonNativeSelfSig() { WATCHVER=4 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
