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

jamessan pushed a commit to branch master
in repository devscripts.

commit 1a8c594001622d780f5b329a23e285942c0ae6a8
Author: James McCoy <[email protected]>
Date:   Sun Nov 20 09:18:57 2016 -0700

    debuild: Remove support for deprecated -L option
    
    Signed-off-by: James McCoy <[email protected]>
---
 scripts/debuild.pl | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index b5d402e..68a132b 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -877,7 +877,7 @@ if ($command_version eq 'dpkg') {
        /^-j(auto|\d*)$/ and $parallel=($1 || '-1'), push(@dpkg_opts, $_), next;
 
        # these non-dpkg-buildpackage options make us stop
-       if ($_ eq '-L' or $_ eq '--lintian' or /^--lintian-opts$/) {
+       if ($_ eq '--lintian-opts') {
            unshift @ARGV, $_;
            last;
        }
@@ -895,29 +895,15 @@ if ($command_version eq 'dpkg') {
     }
 
     # Pick up lintian options if necessary
-    if ($run_lintian && @ARGV) {
+    if (@ARGV) {
        # Check that option is sensible
-    LIN_OPTS:
-       while (@ARGV) {
-           my $whichlin = shift;
-           if ($whichlin eq '-L' or $whichlin eq '--lintian') {
+       if ($ARGV[0] eq '--lintian-opts') {
+           if (! $run_lintian) {
                push @warnings,
-                   "the $whichlin option is deprecated for indicating the 
start\nof lintian options, please use --lintian-opts instead\n  (I substituted 
-L with --lintian-opts this time)";
-               $whichlin = '--lintian-opts';
-           }
-           if ($whichlin eq '--lintian-opts') {
-               if (! $run_lintian) {
-                   push @warnings,
-                       "$whichlin option given but not running lintian!";
-               }
-               while ($_=shift) {
-                   if (/^--lintian-opts$/) {
-                       unshift @ARGV, $_;
-                       next LIN_OPTS;
-                   }
-                   push @lintian_opts, $_;
-               }
+                   "$ARGV[0] option given but not running lintian!";
            }
+           shift;
+           push(@lintian_opts, @ARGV);
        }
     }
 

-- 
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

Reply via email to