From: Guillem Jover <guillem@debian.org>
Date: Wed, 8 Aug 2007 02:43:35 +0000 (+0300)
Subject: Do not print empty lines after 'Setting up ...' output.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89da651919808b9a732de7dc692f0eca8f14fc01;p=dpkg

Do not print empty lines after 'Setting up ...' output.
---

diff --git a/ChangeLog b/ChangeLog
index 8afa435e..88aaa1a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-08  Guillem Jover  <guillem@debian.org>
+
+	* src/configure.c (deferred_configure): Do not print a new line
+	if maintainer_script_installed returned true.
+
 2007-08-08  Guillem Jover  <guillem@debian.org>
 
 	* dpkg-deb/build.c (do_build): Use NULL instead of '(char *)0'.
diff --git a/debian/changelog b/debian/changelog
index 6d8af604..fa186997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ dpkg (1.14.6) UNRELEASED; urgency=low
     results with overlapping patterns on 'dpkg-query -W'. Closes: #428427
   * Tightening dpkg-dev versioned Depends to dpkg 1.14.6, and dpkg Conflicts
     against << dpkg-dev 1.14.6, where the perl modularization started.
+  * Do not print empty lines after 'Setting up ...' output. Closes: #392317
 
   [ Updated scripts translations ]
   * French (Frédéric Bothamy, Christian Perrier).
diff --git a/src/configure.c b/src/configure.c
index c1a70a74..23f92803 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -297,14 +297,12 @@ void deferred_configure(struct pkginfo *pkg) {
 
 	modstatdb_note(pkg);
 
-	if (maintainer_script_installed(pkg, POSTINSTFILE, "post-installation",
-				"configure",
-				informativeversion(&pkg->configversion)
-				? versiondescribe(&pkg->configversion,
-					vdew_nonambig)
-				: "",
-				NULL))
-		putchar('\n');
+	maintainer_script_installed(pkg, POSTINSTFILE, "post-installation",
+	                            "configure",
+	                            informativeversion(&pkg->configversion) ?
+	                            versiondescribe(&pkg->configversion,
+	                                            vdew_nonambig) : "",
+	                            NULL);
 
 	pkg->status= stat_installed;
 	pkg->eflag= eflagv_ok;