[debhelper-devel] [Git][debian/debhelper][master] Dh_Lib: Avoid load-time dependency on d/control

[Niels Thykier]

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
59940fb4 by Niels Thykier at 2018-03-29T19:10:04+00:00
Dh_Lib: Avoid load-time dependency on d/control

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


2 changed files:

- debian/changelog
- lib/Debian/Debhelper/Dh_Lib.pm


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,8 @@ debhelper (11.1.6) UNRELEASED; urgency=medium
   * dh_installinfo: Report installed files to dh_missing.  Thanks
     to Daniel Kahn Gillmor for reporting this omission.
     (Closes: #893160)
+  * Dh_Lib: Make Dh_Lib loadable again without a debian/control being
+    present.  This makes the autopkgtests work again.
 
  -- Niels Thykier <niels at thykier.net>  Mon, 26 Feb 2018 19:32:52 +0000
 


=====================================
lib/Debian/Debhelper/Dh_Lib.pm
=====================================
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -188,6 +188,10 @@ sub init {
 # on, if it's exiting successfully.
 my $write_log=1;
 sub END {
+	# If there is no 'debian/control', then we are not being run from
+	# a package directory and then the write_log will not do what we
+	# expect.
+	return if not -f 'debian/control';
 	if ($? == 0 && $write_log && (compat(9, 1) || $ENV{DH_INTERNAL_OVERRIDE})) {
 		write_log(basename($0), @{$dh{DOPACKAGES}});
 	}



View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/59940fb42868be0acf716d2eb29f6c15b59d1daf

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/59940fb42868be0acf716d2eb29f6c15b59d1daf
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debhelper-devel/attachments/20180329/372b8c0b/attachment-0001.html>