[dpkg] 119/200: test: Correctly iterate over all default and passed .dsc template substvars

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository dpkg.

commit 028bfa99a016ae133e451d606d7b88a2975b5680
Author: Guillem Jover <guillem at debian.org>
Date:   Wed Jan 25 03:30:35 2017 +0100

    test: Correctly iterate over all default and passed .dsc template substvars
    
    The code was returning all keys and values for %default_substvars,
    when instead we should have been requesting all %default_substvars
    and %options keys.
---
 debian/changelog        | 1 +
 scripts/t/dpkg_source.t | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0851341..53e9b6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ dpkg (1.18.19) UNRELEASED; urgency=medium
       Prompted by Stuart Prescott <stuart at debian.org>.
   * Test suite:
     - Generate and check all currently possible architecture wildcards.
+    - Correctly iterate over all default and passed .dsc template substvars.
 
   [ Updated programs translations ]
   * German (Sven Joachim).
diff --git a/scripts/t/dpkg_source.t b/scripts/t/dpkg_source.t
index 974e371..2de0c0d 100644
--- a/scripts/t/dpkg_source.t
+++ b/scripts/t/dpkg_source.t
@@ -89,7 +89,7 @@ sub gen_source
     my (%options) = @_;
 
     my $substvars = Dpkg::Substvars->new();
-    foreach my $var (%default_substvars) {
+    foreach my $var ((keys %default_substvars, keys %options)) {
         my $value = $options{$var} // $default_substvars{$var};
 
         $substvars->set_as_auto($var, $value);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git