dpkg-deb: improve error message "unable to extract"

* src/archives.c (tarobject): Improve error message stating that
dpkg is unable to create a file so that it also refers to the real
filename instead of the non-diverted name only.

diff --git a/ChangeLog b/ChangeLog
index 0f8f9ad2373c29ed227ef0b8fc786e06a8e1ea63..3da945535ac7a2cfef2fdb5bd62d844567364b16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-01  Daniel Hahler  <debian-bugs@thequod.de>
+
+       * src/archives.c (tarobject): Improve error message stating that
+       dpkg is unable to create a file so that it also refers to the real
+       filename instead of the non-diverted name only.
+
 2008-05-31  Raphael Hertzog  <hertzog@debian.org>
 
        * src/query.c (searchfiles): Trim trailing slashes (and slash dot)

diff --git a/THANKS b/THANKS
index d203253edafce7efa3f7156c2ad202863f60a1a7..096a34422d75802afe816ee284e6e351d8ca47c7 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -35,6 +35,7 @@ Colin Plumb <colin@nyx.net>
 Colin Watson <cjwatson@debian.org>
 Dafydd Harries <daf@muse.19inch.net>
 Dan Gohman <gohmandj@mrs.umn.edu>
+Daniel Hahler <debian-bugs@thequod.de>
 Daniel Jacobowitz <dan@debian.org>
 Daniel Leidert <daniel.leidert@wgdd.de>
 Daniel Nylander <yeager@lidkoping.net>

diff --git a/debian/changelog b/debian/changelog
index 138de35b1b0a3a4b06c83e85a43bb2acba694e58..26c5271a75315bba04aec593a75325afed0a40d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ dpkg (1.15.0) UNRELEASED; urgency=low
   * Update dpkg(1) to refer to conffile whenever we speak of configuration
     file handled by dpkg. Thus harmonize vocabulary with the policy. Thanks
     to Helge Kreutzmann <debian@helgefjell.de>. Closes: #381219
+  * Improve error message stating that dpkg is unable to create a file so that
+    it also refers to the real filename instead of the non-diverted name only.
+    Thanks to Daniel Hahler for the patch. Closes: #457135
 
   [ Pierre Habouzit ]
   * Add a --query option to update-alternatives. Closes: #336091, #441904

diff --git a/src/archives.c b/src/archives.c
index 50ca0349a9ebcad705b4fc7b9dc43b1845f017db..5124e1ff6b8f3b97044e6560814a844d448d9082 100644 (file)
--- a/src/archives.c
+++ b/src/archives.c
@@ -650,7 +650,8 @@ int tarobject(struct TarInfo *ti) {
      * it until we apply the proper mode, which might be a statoverride.
      */
     fd= open(fnamenewvb.buf, (O_CREAT|O_EXCL|O_WRONLY), 0);
-    if (fd < 0) ohshite(_("unable to create `%.255s'"),ti->Name);
+    if (fd < 0)
+      ohshite(_("unable to create `%.255s' (while processing `%.255s')"), fnamenewvb.buf, ti->Name);
     push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd);
     debug(dbg_eachfiledetail,"tarobject NormalFile[01] open size=%lu",
           (unsigned long)ti->Size);