[dpkg] 103/200: Dpkg::Source::Package::V2: Abort on EOF in patch name prompt

[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 c786b8aaba703c94072f4838c42e6ae6aaae9085
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Jan 15 16:20:42 2017 +0100

    Dpkg::Source::Package::V2: Abort on EOF in patch name prompt
    
    Instead of entering into an infinite loop.
    
    Closes: #851441
---
 debian/changelog                  | 2 ++
 scripts/Dpkg/Source/Package/V2.pm | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9cd5641..cbf37b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dpkg (1.18.19) UNRELEASED; urgency=medium
       matchings work. Missed in dpkg 1.18.11.
       Reported by Julian Andres Klode <jak at debian.org>.
     - Add new import tags for Dpkg::Arch.
+    - Abort on EOF in patch name prompt in Dpkg::Source::Package::V2,
+      instead of getting into an infinite loop. Closes: #851441
   * Documentation:
     - Cleanup software requirements in README.
     - Move control member file references from dpkg(1) to deb(5).
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 9f5b521..d9cee62 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -722,7 +722,9 @@ sub do_commit {
         # Ask the patch name interactively
         print g_('Enter the desired patch name: ');
         $patch_name = <STDIN>;
-        next unless defined $patch_name;
+        if (not defined $patch_name) {
+            error(g_('no patch name given; cannot proceed'));
+        }
         chomp $patch_name;
         $patch_name =~ s/\s+/-/g;
         $patch_name =~ s/\///g;

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