[devscripts] 01/03: mk-build-deps: Pass package name, not file name, to “dpkg --remove”

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 5ff1a78470e344fee080f4777ab33d624ca582cc
Author: James McCoy <jamessan at debian.org>
Date:   Sat Jul 5 12:55:31 2014 -0400

    mk-build-deps: Pass package name, not file name, to “dpkg --remove”
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog         | 3 +++
 scripts/mk-build-deps.pl | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7de081f..1b46bc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ devscripts (2.14.6) UNRELEASED; urgency=medium
   [ James McCoy ]
   * namecheck: Remove berlios, since it no longer hosts code.  (Closes:
     #752382)
+  * mk-build-deps:
+    + Provide the package name, not file name, to “dpkg --remove” when package
+      install fails.
 
   [ Christoph Berg ]
   * Update all qa.debian.org URLs to https://.
diff --git a/scripts/mk-build-deps.pl b/scripts/mk-build-deps.pl
index c8ac00c..b5a4cb3 100755
--- a/scripts/mk-build-deps.pl
+++ b/scripts/mk-build-deps.pl
@@ -357,7 +357,7 @@ if ($opt_install) {
     if ( ($?>>8) != 0 ) {
 	# Restore system to previous state, since apt wasn't able to resolve a
 	# proper way to get the build-dep packages installed
-	system @root, 'dpkg', '--remove', @deb_files;
+	system @root, 'dpkg', '--remove', @packages;
 	die("install call failed\n");
     }
 

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