[packagekit] packagekit: Branch 'master' - 3 commits

[Richard Hughes]

 acinclude.m4                             |    2 +-
 backends/conary/helpers/conaryBackend.py |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d276c15c7848bf76d91e1884d76b1a0d20b78274
Merge: 7b975cb... a0e94fa...
Author: Elliot Peele <elliot at bentlogic.net>
Date:   Sun Nov 4 20:23:10 2007 -0500

    Merge branch 'master' of git+ssh://git.packagekit.org/srv/git/PackageKit

commit 7b975cb55d1ea3b8dd0ab8eecc16566afb535458
Author: Elliot Peele <elliot at bentlogic.net>
Date:   Sun Nov 4 20:22:46 2007 -0500

    switch to keepRequired

diff --git a/backends/conary/helpers/conaryBackend.py b/backends/conary/helpers/conaryBackend.py
index 69877a7..a32be0d 100644
--- a/backends/conary/helpers/conaryBackend.py
+++ b/backends/conary/helpers/conaryBackend.py
@@ -21,9 +21,12 @@ from conaryCallback import UpdateCallback
 class PackageKitConaryBackend(PackageKitBaseBackend):
     def __init__(self, args):
         PackageKitBaseBackend.__init__(self, args)
+
         self.cfg = conarycfg.ConaryConfiguration(True)
         self.cfg.initializeFlavors()
         self.cfg.autoResolve = True
+        self.cfg.keepRequired = True
+
         self.client = conaryclient.ConaryClient(self.cfg)
         self.callback = UpdateCallback(self, self.cfg)
         self.client.setUpdateCallback(self.callback)
commit a0e94fa0f99ffde4e5b6c30d6351c4a9922aebe1
Author: James Bowes <jbowes at dangerouslyinc.com>
Date:   Sun Nov 4 20:05:57 2007 -0500

    Silence 'underquoted definition' automake warning.

diff --git a/acinclude.m4 b/acinclude.m4
index df95cb1..58f310e 100755
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -8,7 +8,7 @@ dnl Swiped from http://www.initd.org/svn/psycopg/psycopg1/trunk/aclocal.m4
 
 dnl PY_CHECK_MOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
 dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN(PY_CHECK_MOD,
+AC_DEFUN([PY_CHECK_MOD],
 [AC_REQUIRE([AM_PATH_PYTHON])
 py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
 AC_MSG_CHECKING(for ifelse([$3],[],,[$2 in ])python module $1)