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

guillem pushed a commit to branch master
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=740c330ad0deb5d4894ad43619fc80cfa0cf8313

commit 740c330ad0deb5d4894ad43619fc80cfa0cf8313
Author: Guillem Jover <[email protected]>
AuthorDate: Sat Mar 2 02:41:40 2019 +0100

    Dpkg::Source::Package::V1: Change default build option style to -sa
    
    Using -sA by default means the user might lose data on overwrite if
    there is already a directory with the same name laying around.
    
    Closes: #910737
---
 debian/changelog                  | 5 +++++
 man/dpkg-source.man               | 2 +-
 scripts/Dpkg/Source/Package/V1.pm | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3346afa9e..dc7a3e4d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ dpkg (1.19.6) UNRELEASED; urgency=medium
     free()s and the subsequent crashes.
   * libdpkg: Handle non end-of-tape errors from tar_header_decode().
   * libdpkg: Use ERANGE instead of EINVAL for tar_atol8() out-of-range error.
+  * Perl modules:
+    - Dpkg::Source::Package::V1: Change default build option style to -sa.
+      Using -sA by default means the user might lose data on overwrite if
+      there is already a directory with the same name laying around.
+      Closes: #910737
   * Packaging:
     - Update usertags.
     - Install a lintian profile for dpkg based on the debian profile, so that
diff --git a/man/dpkg-source.man b/man/dpkg-source.man
index 502c67311..09a2ec7bd 100644
--- a/man/dpkg-source.man
+++ b/man/dpkg-source.man
@@ -400,7 +400,7 @@ was specified (this is equivalent to
 or raise an error if
 .B \-sa
 was specified.
-.B \-sA
+.B \-sa
 is the default.
 .TP
 .B \-\-abort\-on\-upstream\-changes
diff --git a/scripts/Dpkg/Source/Package/V1.pm 
b/scripts/Dpkg/Source/Package/V1.pm
index 38c2498f4..be13750a4 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -267,7 +267,7 @@ sub do_build {
                     'argument (with v1.0 source package)'));
     }
 
-    $sourcestyle =~ y/X/A/;
+    $sourcestyle =~ y/X/a/;
     unless ($sourcestyle =~ m/[akpursnAKPUR]/) {
         usageerr(g_('source handling style -s%s not allowed with -b'),
                  $sourcestyle);

-- 
Dpkg.Org's dpkg

Reply via email to