The following commit has been merged in the master branch:
commit fcd32924f34859ae9cab48d92e054b297a577bc5
Author: Sean Finney <[email protected]>
Date: Wed Oct 14 21:23:04 2009 +0200
dpkg: Pass a pkginfo structure to promptconfaction()
In order to provide an interface into the conffiles DB API, it's required
to know the package name that owns the conffile. Since this is a static
function and the package structure is available in all places that the
function is used, this is a fairly easy fix.
Signed-off-by: Guillem Jover <[email protected]>
diff --git a/src/configure.c b/src/configure.c
index 02b96a2..4d1efb4 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -59,7 +59,7 @@ static int conffoptcells[2][2] = {
static void md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn);
static void showdiff(const char *old, const char *new);
static void suspend(void);
-static enum conffopt promptconfaction(const char *cfgfile,
+static enum conffopt promptconfaction(struct pkginfo *pkg, const char *cfgfile,
const char *realold, const char *realnew,
int useredited, int distedited,
enum conffopt what);
@@ -150,7 +150,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct
conffile *conff)
"deferred_configure '%s' (= '%s') useredited=%d distedited=%d
what=%o",
usenode->name, cdr.buf, useredited, distedited, what);
- what = promptconfaction(usenode->name, cdr.buf, cdr2.buf,
+ what = promptconfaction(pkg, usenode->name, cdr.buf, cdr2.buf,
useredited, distedited, what);
switch (what & ~(cfof_isnew | cfof_userrmd)) {
@@ -575,7 +575,8 @@ suspend(void)
* Select what to do with a configuration file.
*/
static enum conffopt
-promptconfaction(const char *cfgfile, const char *realold, const char *realnew,
+promptconfaction(struct pkginfo *pkg, const char *cfgfile,
+ const char *realold, const char *realnew,
int useredited, int distedited, enum conffopt what)
{
const char *s;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
