Merge lp:~federico-gnome/zeitgeist/fixes into lp:zeitgeist/0.1

Proposed by Federico Mena Quintero
Status: Merged
Merged at revision: 1664
Proposed branch: lp:~federico-gnome/zeitgeist/fixes
Merge into: lp:zeitgeist/0.1
Diff against target: 21 lines (+7/-4)
1 file modified
configure.ac (+7/-4)
To merge this branch: bzr merge lp:~federico-gnome/zeitgeist/fixes
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen Approve
Review via email: mp+46950@code.launchpad.net

This proposal supersedes a proposal from 2011-01-19.

Description of the change

Instead of checking for rdfpipe(1), we now check for the rdflib module from python.

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote : Posted in a previous version of this proposal

I believe that it's a shorthand check for the python-rdflib package.
In Ubuntu, at least, that package ships this tool. We python-rdflib
for parsing the ontologies at build time

Revision history for this message
Seif Lotfy (seif) wrote : Posted in a previous version of this proposal

we need python-rdflib
this patch just takes it out so we have no way of telling on configure that
python-rdflib is missing so we need a better solution. This patch doesn't
fix the problem. :(

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote : Posted in a previous version of this proposal

Maybe we can replace the check for rdfpipe with something ala:

python -c "import rdflib"
if [ "$?" != "0" ]; then
  echo "You need the Python module 'rdflib' in order to compile Zeitgeist"
  exit 1
fi

Revision history for this message
Seif Lotfy (seif) wrote : Posted in a previous version of this proposal

sounds good to me +1
Mikkel you can change that in trunk directly then :)

On Thu, Jan 20, 2011 at 8:07 AM, Mikkel Kamstrup Erlandsen <
<email address hidden>> wrote:

> Maybe we can replace the check for rdfpipe with something ala:
>
> python -c "import rdflib"
> if [ "$?" != "0" ]; then
> echo "You need the Python module 'rdflib' in order to compile Zeitgeist"
> exit 1
> fi
>
> --
> https://code.launchpad.net/~federico-gnome/zeitgeist/fixes/+merge/46803
> You are subscribed to branch lp:zeitgeist.
>

--
This is me doing some advertisement for my blog http://seilo.geekyogre.com

lp:~federico-gnome/zeitgeist/fixes updated
1664. By Federico Mena Quintero

Don't check for rdfpipe(1); check for the python-rdflib module instead

rdfpipe(1) only comes with python-rdflib prior to 3.0.0. That command got moved
to a separate rdfextras package.

We now actually test whether python can import the rdflib module.

Revision history for this message
Federico Mena Quintero (federico-gnome) wrote :

OK, I added the necessary autofoo to do a similar check. Can someone please check it? :)

Revision history for this message
Seif Lotfy (seif) wrote :

AWESOME will do today or tomorrow

On Thu, Jan 20, 2011 at 7:39 PM, Federico Mena Quintero
<email address hidden>wrote:

> OK, I added the necessary autofoo to do a similar check. Can someone
> please check it? :)
> --
> https://code.launchpad.net/~federico-gnome/zeitgeist/fixes/+merge/46950
> You are subscribed to branch lp:zeitgeist.
>

--
This is me doing some advertisement for my blog http://seilo.geekyogre.com

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-01-18 10:49:04 +0000
3+++ configure.ac 2011-01-20 18:39:40 +0000
4@@ -37,10 +37,13 @@
5 AC_MSG_ERROR(You need the tool `rapper' from the `raptor-utils' package in order to compile Zeitgeist)
6 fi
7
8-# check for rdflib
9-AC_CHECK_PROG(HAVE_RDFLIB, rdfpipe, yes, no)
10-if test "x$HAVE_RDFLIB" = "xno"; then
11- AC_MSG_ERROR(You need the tool `rdfpipe' from the `python-rdflib' package in order to compile Zeitgeist)
12+# check for python-rdflib
13+AC_MSG_CHECKING([for python-rdflib])
14+echo "import rdflib" | python - 2>/dev/null
15+if test $? -ne 0 ; then
16+ AC_MSG_FAILURE([failed. Please install the python-rdflib package.])
17+else
18+ AC_MSG_RESULT([yes])
19 fi
20
21 AC_OUTPUT