in order to provide an interface into the conffile db api, it's required
to know the package name that owns the conffile. since this is a static
function and the package name is available in all places that the function
is used, this is a fairly easy fix.
---
src/configure.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/configure.c b/src/configure.c
index 17bf941..e195362 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -61,7 +61,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(const char *pkg, const char *cfgfile,
const char *realold, const char *realnew,
int useredited, int distedited,
enum conffopt what);
@@ -151,7 +151,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->name, usenode->name, cdr.buf, cdr2.buf,
useredited, distedited, what);
switch (what & ~(cfof_isnew | cfof_userrmd)) {
@@ -560,8 +560,9 @@ suspend(void)
* Select what to do with a configuration file.
*/
static enum conffopt
-promptconfaction(const char *cfgfile, const char *realold, const char *realnew,
- int useredited, int distedited, enum conffopt what)
+promptconfaction(const char *pkg, const char *cfgfile, const char *realold,
+ const char *realnew, int useredited, int distedited,
+ enum conffopt what)
{
const char *s;
int c, cc;
--
1.6.4.3
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
