Просмотр исходного кода

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.
Daniel Hahler лет назад: 18
Родитель
Сommit
0ee8807033
4 измененных файлов с 12 добавлено и 1 удалено
  1. 6 0
      ChangeLog
  2. 1 0
      THANKS
  3. 3 0
      debian/changelog
  4. 2 1
      src/archives.c

+ 6 - 0
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>
 2008-05-31  Raphael Hertzog  <hertzog@debian.org>
 
 
 	* src/query.c (searchfiles): Trim trailing slashes (and slash dot)
 	* src/query.c (searchfiles): Trim trailing slashes (and slash dot)

+ 1 - 0
THANKS

@@ -35,6 +35,7 @@ Colin Plumb <colin@nyx.net>
 Colin Watson <cjwatson@debian.org>
 Colin Watson <cjwatson@debian.org>
 Dafydd Harries <daf@muse.19inch.net>
 Dafydd Harries <daf@muse.19inch.net>
 Dan Gohman <gohmandj@mrs.umn.edu>
 Dan Gohman <gohmandj@mrs.umn.edu>
+Daniel Hahler <debian-bugs@thequod.de>
 Daniel Jacobowitz <dan@debian.org>
 Daniel Jacobowitz <dan@debian.org>
 Daniel Leidert <daniel.leidert@wgdd.de>
 Daniel Leidert <daniel.leidert@wgdd.de>
 Daniel Nylander <yeager@lidkoping.net>
 Daniel Nylander <yeager@lidkoping.net>

+ 3 - 0
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
   * Update dpkg(1) to refer to conffile whenever we speak of configuration
     file handled by dpkg. Thus harmonize vocabulary with the policy. Thanks
     file handled by dpkg. Thus harmonize vocabulary with the policy. Thanks
     to Helge Kreutzmann <debian@helgefjell.de>. Closes: #381219
     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 ]
   [ Pierre Habouzit ]
   * Add a --query option to update-alternatives. Closes: #336091, #441904
   * Add a --query option to update-alternatives. Closes: #336091, #441904

+ 2 - 1
src/archives.c

@@ -650,7 +650,8 @@ int tarobject(struct TarInfo *ti) {
      * it until we apply the proper mode, which might be a statoverride.
      * it until we apply the proper mode, which might be a statoverride.
      */
      */
     fd= open(fnamenewvb.buf, (O_CREAT|O_EXCL|O_WRONLY), 0);
     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);
     push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd);
     debug(dbg_eachfiledetail,"tarobject NormalFile[01] open size=%lu",
     debug(dbg_eachfiledetail,"tarobject NormalFile[01] open size=%lu",
           (unsigned long)ti->Size);
           (unsigned long)ti->Size);