poldek: poldek/configure.in, poldek/pm/rpm/misc.c - rpmioAccess() ...
mis
mis at pld-linux.org
Mon Jan 8 22:12:16 CET 2007
Author: mis Date: Mon Jan 8 21:12:16 2007 GMT
Module: poldek Tag: HEAD
---- Log message:
- rpmioAccess() availability checking
---- Files affected:
poldek/poldek:
configure.in (1.126 -> 1.127)
poldek/poldek/pm/rpm:
misc.c (1.9 -> 1.10)
---- Diffs:
================================================================
Index: poldek/poldek/configure.in
diff -u poldek/poldek/configure.in:1.126 poldek/poldek/configure.in:1.127
--- poldek/poldek/configure.in:1.126 Sun Dec 17 23:37:05 2006
+++ poldek/poldek/configure.in Mon Jan 8 22:12:11 2007
@@ -306,6 +306,7 @@
dnl - killed rpmMachineScore and rpmGetVar
AC_CHECK_FUNCS(rpmMachineScore)
AC_CHECK_FUNCS(rpmGetVar)
+AC_CHECK_FUNCS(rpmioAccess)
dnl - new _rpmvercmp()
AC_CHECK_FUNCS(_rpmvercmp)
================================================================
Index: poldek/poldek/pm/rpm/misc.c
diff -u poldek/poldek/pm/rpm/misc.c:1.9 poldek/poldek/pm/rpm/misc.c:1.10
--- poldek/poldek/pm/rpm/misc.c:1.9 Mon Jan 8 18:22:00 2007
+++ poldek/poldek/pm/rpm/misc.c Mon Jan 8 22:12:11 2007
@@ -251,13 +251,14 @@
return rc;
}
-
int pm_rpm_satisfies(void *pm_rpm, const struct capreq *req)
{
- int n, rc = 0;
- const char *name;
+ int n = 0, rc = 0;
+ const char *name = NULL;
pm_rpm = pm_rpm;
+
+#if HAVE_RPMIOACCESS
if (capreq_versioned(req))
return 0;
@@ -277,6 +278,6 @@
rc = (rpmioAccess(name, NULL, X_OK) == 0);
}
-
+#endif /* HAVE_RPMIOACCESS */
return rc;
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/poldek/poldek/configure.in?r1=1.126&r2=1.127&f=u
http://cvs.pld-linux.org/poldek/poldek/pm/rpm/misc.c?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list