[devscripts] 02/02: test/uscan_mangle: Use a real newline instead of embedding \n in a shell variable, which isn't portable between dash and bash.

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository devscripts.

commit 700940607f921d3db623afc8b2fbd9eaed7c8413
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Dec 29 19:26:21 2017 +0100

    test/uscan_mangle: Use a real newline instead of embedding \n in a shell variable, which isn't portable between dash and bash.
    
    This should fix a long standing (2+ years) FTBFS in the Reproducible
    Builds CI, where a tested difference is the default shell (dash vs
    bash).
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/changelog       | 5 ++++-
 test/test_uscan_mangle | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23c26a1..7e97a5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,7 +39,10 @@ devscripts (2.17.12) UNRELEASED; urgency=medium
 
   [ Mattia Rizzolo ]
   * debdiff-apply:
-    + Avoid using Python bare exception, to appease flake8's E722.
+    + Avoid using Python bare exceptions, to appease flake8's E722.
+  * test/uscan_mangle:
+    + Use a real newline instead of embedding \n in a shell variable, which
+      isn't portable between dash and bash.
 
  -- Mattia Rizzolo <mattia at debian.org>  Mon, 30 Oct 2017 07:48:10 +0100
 
diff --git a/test/test_uscan_mangle b/test/test_uscan_mangle
index 60a85ad..05f1dfc 100755
--- a/test/test_uscan_mangle
+++ b/test/test_uscan_mangle
@@ -879,7 +879,8 @@ testWatch4WebNonNativeUA() {
     KEYMODE=BIN
     USCAN_HTTP_SERVER="server-head.py"
     USERAGENT="foo/bar; baz:12,3.45"
-    WATCHLINE='opts="useragent= '$USERAGENT' "'"\n"'@@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate'
+    WATCHLINE='opts="useragent= '$USERAGENT' "'"
+"'@@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate'
     helperWatchUA
     unset USERAGENT
     unset USCAN_HTTP_SERVER

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git