2008-02-10 18:33:44

by Filippo Giunchedi

[permalink] [raw]
Subject: [Bluez-devel] [PATCH] account for non-existant update-*-database

Hi,
I've noticed a bug in bluez-gnome when update-*-database programs are not
present (i.e. $UPDATE_*_DATABASE is "" thus install-data-hook fails), the
following patch (or something similar) should work:

--- gnome/configure.in 10 Feb 2008 17:46:50 -0000 1.63
+++ gnome/configure.in 10 Feb 2008 18:31:57 -0000
@@ -27,15 +27,15 @@

AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, [update-desktop-database])
AC_ARG_ENABLE(desktop-update, AC_HELP_STRING([--disable-desktop-update], [Disable desktop database update]))
-AM_CONDITIONAL([DESKTOP_UPDATE], [test "$enable_desktop_update" != no])
+AM_CONDITIONAL([DESKTOP_UPDATE], [test "$enable_desktop_update" != no -a ! -z "$UPDATE_DESKTOP_DATABASE"])

AC_PATH_PROG(UPDATE_MIME_DATABASE, [update-mime-database])
AC_ARG_ENABLE(mime-update, AC_HELP_STRING([--disable-mime-update], [Disable mime database update]))
-AM_CONDITIONAL([MIME_UPDATE], [test "$enable_mime_update" != no])
+AM_CONDITIONAL([MIME_UPDATE], [test "$enable_mime_update" != no -a ! -z "$UPDATE_MIME_DATABASE"])

AC_PATH_PROG(UPDATE_ICON_CACHE, [gtk-update-icon-cache])
AC_ARG_ENABLE(icon-update, AC_HELP_STRING([--disable-icon-update], [Disable icon cache update]))
-AM_CONDITIONAL([ICON_UPDATE], [test "$enable_icon_update" != no])
+AM_CONDITIONAL([ICON_UPDATE], [test "$enable_icon_update" != no -a ! -z "$UPDATE_ICON_CACHE"])

PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.60, dummy=yes, AC_MSG_ERROR(dbus-glib >= 0.60 is required))
m4_ifdef([PKG_CHECK_EXISTS], [

thanks,
filippo
--
Filippo Giunchedi - http://esaurito.net
PGP key: 0x6B79D401
random quote follows:

I worked myself up from nothing to a state of extreme poverty.
-- Groucho Marx

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel


2008-02-10 21:56:22

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [Bluez-devel] [PATCH] account for non-existant update-*-database

Hi Filippo,

> > > > > I've noticed a bug in bluez-gnome when update-*-database programs are not
> > > > > present (i.e. $UPDATE_*_DATABASE is "" thus install-data-hook fails), the
> > > > > following patch (or something similar) should work:
> > > >
> > > > call --disable-*-update should be a good thing for packages. And then
> > > > have some post-install routines. Not doing the update is really a
> > > > problem, because it limits the functionality. So producing an error
> > > > seems fine to me.
> > >
> > > I agree, note though that in this case the error is "permission denied" since
> > > make will try to execute a directory (e.g. $(DESTDIR)$(datadir)/mime) when
> > > UPDATE_*_DATABASE is "" which is not much straightforward.
> >
> > I put something in the CVS now that should fix it. Please test it.
>
> typo:
>
> AM_CONDITIONAL([MIME_UPDATE], [test -n "$UPDATE_DESKTOP_DATABASE"])

has been fixed now. Thanks.

Regards

Marcel



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

2008-02-10 21:40:29

by Filippo Giunchedi

[permalink] [raw]
Subject: Re: [Bluez-devel] [PATCH] account for non-existant update-*-database

On Sun, Feb 10, 2008 at 09:24:42PM +0100, Marcel Holtmann wrote:
> Hi Filippo,
>
> > > > I've noticed a bug in bluez-gnome when update-*-database programs are not
> > > > present (i.e. $UPDATE_*_DATABASE is "" thus install-data-hook fails), the
> > > > following patch (or something similar) should work:
> > >
> > > call --disable-*-update should be a good thing for packages. And then
> > > have some post-install routines. Not doing the update is really a
> > > problem, because it limits the functionality. So producing an error
> > > seems fine to me.
> >
> > I agree, note though that in this case the error is "permission denied" since
> > make will try to execute a directory (e.g. $(DESTDIR)$(datadir)/mime) when
> > UPDATE_*_DATABASE is "" which is not much straightforward.
>
> I put something in the CVS now that should fix it. Please test it.

typo:

AM_CONDITIONAL([MIME_UPDATE], [test -n "$UPDATE_DESKTOP_DATABASE"])
^^^^^^^

the rest looks good, thanks
filippo
--
Filippo Giunchedi - http://esaurito.net
PGP key: 0x6B79D401
random quote follows:

What a strange illusion it is to suppose that beauty is goodness.
-- Lev Tolstoj

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

2008-02-10 20:24:42

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [Bluez-devel] [PATCH] account for non-existant update-*-database

Hi Filippo,

> > > I've noticed a bug in bluez-gnome when update-*-database programs are not
> > > present (i.e. $UPDATE_*_DATABASE is "" thus install-data-hook fails), the
> > > following patch (or something similar) should work:
> >
> > call --disable-*-update should be a good thing for packages. And then
> > have some post-install routines. Not doing the update is really a
> > problem, because it limits the functionality. So producing an error
> > seems fine to me.
>
> I agree, note though that in this case the error is "permission denied" since
> make will try to execute a directory (e.g. $(DESTDIR)$(datadir)/mime) when
> UPDATE_*_DATABASE is "" which is not much straightforward.

I put something in the CVS now that should fix it. Please test it.

Regards

Marcel



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

2008-02-10 19:51:48

by Filippo Giunchedi

[permalink] [raw]
Subject: Re: [Bluez-devel] [PATCH] account for non-existant update-*-database

On Sun, Feb 10, 2008 at 07:57:49PM +0100, Marcel Holtmann wrote:
> Hi Filippo,
>
> > I've noticed a bug in bluez-gnome when update-*-database programs are not
> > present (i.e. $UPDATE_*_DATABASE is "" thus install-data-hook fails), the
> > following patch (or something similar) should work:
>
> call --disable-*-update should be a good thing for packages. And then
> have some post-install routines. Not doing the update is really a
> problem, because it limits the functionality. So producing an error
> seems fine to me.

I agree, note though that in this case the error is "permission denied" since
make will try to execute a directory (e.g. $(DESTDIR)$(datadir)/mime) when
UPDATE_*_DATABASE is "" which is not much straightforward.

filippo
--
Filippo Giunchedi - http://esaurito.net
PGP key: 0x6B79D401
random quote follows:

Endian little hate we
-- Anonymous (?)

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

2008-02-10 18:57:49

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [Bluez-devel] [PATCH] account for non-existant update-*-database

Hi Filippo,

> I've noticed a bug in bluez-gnome when update-*-database programs are not
> present (i.e. $UPDATE_*_DATABASE is "" thus install-data-hook fails), the
> following patch (or something similar) should work:

call --disable-*-update should be a good thing for packages. And then
have some post-install routines. Not doing the update is really a
problem, because it limits the functionality. So producing an error
seems fine to me.

Regards

Marcel



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel