From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 Jul 2018 11:20:50 +0000 (+0100)
Subject: dgit: update-vcs-git: Honour --package properly.
X-Git-Tag: archive/debian/5.7~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d561b2284c6e988d70794c9871d44c3bb5f0463f

dgit: update-vcs-git: Honour --package properly.

Specifically, use package_from_d_control rather than open-coding
a substandard implementation.

The consequent abolition of $sourcep does mean that if the user
specifies the suite `.', and does not specify -p, we needlessly parse
debian/control twice.  This doesn't really matter.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index 51748225..a45d6337 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (5.7~) unstable; urgency=medium
 
-  * 
+  Bugfixes:
+  * dgit update-vcs-git: Honour --package properly.
 
  --
 
diff --git a/dgit b/dgit
index db12d229..404eab96 100755
--- a/dgit
+++ b/dgit
@@ -4658,11 +4658,10 @@ sub cmd_update_vcs_git () {
 	}
     }
 
-    my $sourcep = parsecontrol 'debian/control', 'debian/control';
-    $package = getfield $sourcep, 'Source';
+    package_from_d_control();
     my $ctrl;
     if ($specsuite eq '.') {
-	$ctrl = $sourcep;
+	$ctrl = parsecontrol 'debian/control', 'debian/control';
     } else {
 	$isuite = $specsuite;
 	get_archive_dsc();