[SCM] dpkg's main repository branch, sid, updated. 1.15.7.1-11-g67dc78b

[Guillem Jover]

The following commit has been merged in the sid branch:
commit 67dc78b406c1b1e62a34bbef090b280b5c900b34
Author: Guillem Jover <guil...@debian.org>
Date:   Mon May 10 18:27:02 2010 +0200

    dpkg: Fix --root by properly stripping root from maintainer script path
    
    The cmd->filename variable was getting the full path to the maintainer
    script inside the chroot, and once dpkg had changed root, the path was
    not valid anymore.
    
    Regression introduced in 5050748f1a6bb0c0728f8c07f9058d545c80d7e0.
    
    Closes: #580984

diff --git a/debian/changelog b/debian/changelog
index 54f1dc1..8cacbfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ dpkg (1.15.7.2) UNRELEASED; urgency=low
   * Add powerpcspe support to ostable and triplettable.
     Thanks to Sebastian Andrzej Siewior <sebast...@breakpoint.cc> and
     Kyle Moffett <kyle.d.moff...@boeing.com>. Closes: #568123, #575158
+  * Fix dpkg --root by properly stripping again the root directory from the
+    path of the maintainer script to execute. Closes: #580984
 
  -- Raphaël Hertzog <hert...@debian.org>  Fri, 23 Apr 2010 18:17:14 +0200
 
diff --git a/src/help.c b/src/help.c
index 59bed9a..b22c1da 100644
--- a/src/help.c
+++ b/src/help.c
@@ -265,7 +265,7 @@ do_script(struct pkginfo *pkg, struct pkginfoperfile *pif,
         setenv(MAINTSCRIPTDPKGENVVAR, PACKAGE_VERSION, 1))
       ohshite(_("unable to setenv for maintainer script"));
 
-    cmd->argv[0] = preexecscript(cmd);
+    cmd->filename = cmd->argv[0] = preexecscript(cmd);
     command_exec(cmd);
   }
   subproc_signals_setup(cmd->name); /* This does a push_cleanup() */

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org