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

diff --git a/ChangeLog b/ChangeLog
index 8afa435e79113e2eaad4c347cd7cd7a3823ce63e..88aaa1a5a4f17b183f2c85cc90795e4d72615bee 100644 (file)
--- 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 6d8af604af4497e293876a5a72d65224fedf1a60..fa186997ed64641f275bb6bfeba88bcb14f68cbd 100644 (file)
--- 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 c1a70a74730ba23a1e25169885361416db6c8896..23f928037f5a6c52a5469f8c3bffd16cf18c15a1 100644 (file)
--- 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;