Issue 6215062: dconf: use text-based key file and dconf update (Closed)
|
Created:
12 years, 6 months ago by Daiki Ueno Modified:
12 years, 6 months ago Base URL:
git@github.com:ibus/ibus.git@master Visibility:
Public. |
Descriptiondconf: use text-based key file and dconf update
BUG=none
TEST=manually
Patch Set 1 #Patch Set 2 : separate org.freedesktop.ibus.general and org.freedesktop.ibus.general.hotkey #
Total comments: 2
Patch Set 3 : separate each schema with empty line #
MessagesTotal messages: 11
Currently "make install" directly puts a binary DB file in /etc/dconf/db/ibus. It does not support merging values from other sources. See: https://live.gnome.org/dconf/SystemAdministrators This patch instead installs /etc/dconf/db/ibus.d/00-upstream-settings and use "dconf update" to update the DB. Recently gdm migrated to this way.
Sign in to reply to this message.
On 2012/05/18 06:13:31, Daiki Ueno wrote: > Currently "make install" directly puts a binary DB file in /etc/dconf/db/ibus. > It does not support merging values from other sources. See: > https://live.gnome.org/dconf/SystemAdministrators > > This patch instead installs /etc/dconf/db/ibus.d/00-upstream-settings and use > "dconf update" to update the DB. Recently gdm migrated to this way. I have one question. Don't you have to separate the settings between org.freedesktop.ibus.general and org.freedesktop.ibus.general.hotkey in 00-upstream-settings ?
Sign in to reply to this message.
On 2012/05/18 06:42:16, fujiwara wrote: > On 2012/05/18 06:13:31, Daiki Ueno wrote: > > Currently "make install" directly puts a binary DB file in /etc/dconf/db/ibus. > > > It does not support merging values from other sources. See: > > https://live.gnome.org/dconf/SystemAdministrators > > > > This patch instead installs /etc/dconf/db/ibus.d/00-upstream-settings and use > > "dconf update" to update the DB. Recently gdm migrated to this way. > > I have one question. Don't you have to separate the settings between > org.freedesktop.ibus.general and org.freedesktop.ibus.general.hotkey in > 00-upstream-settings ? Good point. It should be fixed in CL2.
Sign in to reply to this message.
https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... File data/dconf/make-dconf-override-db.sh (right): https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... data/dconf/make-dconf-override-db.sh:36: echo $schema | sed 's/org\.freedesktop\(.*\)/[desktop\1]/' | tr '.' '/' Maybe it's good to call 'echo ""' before 'echo [foo]' for the readable text.
Sign in to reply to this message.
https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... File data/dconf/make-dconf-override-db.sh (right): https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... data/dconf/make-dconf-override-db.sh:36: echo $schema | sed 's/org\.freedesktop\(.*\)/[desktop\1]/' | tr '.' '/' On 2012/05/18 07:31:07, fujiwara wrote: > Maybe it's good to call 'echo ""' before 'echo [foo]' for the readable text. Done.
Sign in to reply to this message.
On 2012/05/18 08:42:59, Daiki Ueno wrote: > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > File data/dconf/make-dconf-override-db.sh (right): > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > data/dconf/make-dconf-override-db.sh:36: echo $schema | sed > 's/org\.freedesktop\(.*\)/[desktop\1]/' | tr '.' '/' > On 2012/05/18 07:31:07, fujiwara wrote: > > Maybe it's good to call 'echo ""' before 'echo [foo]' for the readable text. > > Done. lgtm. But I am not familiar whit dconf. Please wait fujiwarat's lgtm. Thanks.
Sign in to reply to this message.
On 2012/05/18 08:42:59, Daiki Ueno wrote: > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > File data/dconf/make-dconf-override-db.sh (right): > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > data/dconf/make-dconf-override-db.sh:36: echo $schema | sed > 's/org\.freedesktop\(.*\)/[desktop\1]/' | tr '.' '/' > On 2012/05/18 07:31:07, fujiwara wrote: > > Maybe it's good to call 'echo ""' before 'echo [foo]' for the readable text. > > Done. lgtm
Sign in to reply to this message.
On 2012/05/19 03:33:09, fujiwara wrote: > On 2012/05/18 08:42:59, Daiki Ueno wrote: > > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > > File data/dconf/make-dconf-override-db.sh (right): > > > > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > > data/dconf/make-dconf-override-db.sh:36: echo $schema | sed > > 's/org\.freedesktop\(.*\)/[desktop\1]/' | tr '.' '/' > > On 2012/05/18 07:31:07, fujiwara wrote: > > > Maybe it's good to call 'echo ""' before 'echo [foo]' for the readable text. > > > > Done. > > lgtm I think 00-upstream-settings needs to be inclueded in DISTCLEANFILES for make dist.
Sign in to reply to this message.
On 2012/05/25 02:25:53, fujiwara wrote: > On 2012/05/19 03:33:09, fujiwara wrote: > > On 2012/05/18 08:42:59, Daiki Ueno wrote: > > > > > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > > > File data/dconf/make-dconf-override-db.sh (right): > > > > > > > > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > > > data/dconf/make-dconf-override-db.sh:36: echo $schema | sed > > > 's/org\.freedesktop\(.*\)/[desktop\1]/' | tr '.' '/' > > > On 2012/05/18 07:31:07, fujiwara wrote: > > > > Maybe it's good to call 'echo ""' before 'echo [foo]' for the readable > text. > > > > > > Done. > > > > lgtm > > I think 00-upstream-settings needs to be inclueded in DISTCLEANFILES for make > dist. I thought that it might be better to add the file to MAINTAINERCLEANFILES so that tarball users don't need to regenerate it after make distclean (like *.vapi). What's the actual error you see when make dist?
Sign in to reply to this message.
On 2012/05/25 02:41:21, Daiki Ueno wrote: > On 2012/05/25 02:25:53, fujiwara wrote: > > On 2012/05/19 03:33:09, fujiwara wrote: > > > On 2012/05/18 08:42:59, Daiki Ueno wrote: > > > > > > > > > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > > > > File data/dconf/make-dconf-override-db.sh (right): > > > > > > > > > > > > > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > > > > data/dconf/make-dconf-override-db.sh:36: echo $schema | sed > > > > 's/org\.freedesktop\(.*\)/[desktop\1]/' | tr '.' '/' > > > > On 2012/05/18 07:31:07, fujiwara wrote: > > > > > Maybe it's good to call 'echo ""' before 'echo [foo]' for the readable > > text. > > > > > > > > Done. > > > > > > lgtm > > > > I think 00-upstream-settings needs to be inclueded in DISTCLEANFILES for make > > dist. > > I thought that it might be better to add the file to MAINTAINERCLEANFILES so > that tarball users don't need to regenerate it after make distclean (like > *.vapi). > > What's the actual error you see when make dist? You could run 'make distcheck'. ERROR: files left in build directory after distclean: ./data/dconf/00-upstream-settings
Sign in to reply to this message.
On 2012/05/25 02:52:53, fujiwara wrote: > On 2012/05/25 02:41:21, Daiki Ueno wrote: > > On 2012/05/25 02:25:53, fujiwara wrote: > > > On 2012/05/19 03:33:09, fujiwara wrote: > > > > On 2012/05/18 08:42:59, Daiki Ueno wrote: > > > > > > > > > > > > > > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > > > > > File data/dconf/make-dconf-override-db.sh (right): > > > > > > > > > > > > > > > > > > > > https://codereview.appspot.com/6215062/diff/4001/data/dconf/make-dconf-overri... > > > > > data/dconf/make-dconf-override-db.sh:36: echo $schema | sed > > > > > 's/org\.freedesktop\(.*\)/[desktop\1]/' | tr '.' '/' > > > > > On 2012/05/18 07:31:07, fujiwara wrote: > > > > > > Maybe it's good to call 'echo ""' before 'echo [foo]' for the readable > > > text. > > > > > > > > > > Done. > > > > > > > > lgtm > > > > > > I think 00-upstream-settings needs to be inclueded in DISTCLEANFILES for > make > > > dist. > > > > I thought that it might be better to add the file to MAINTAINERCLEANFILES so > > that tarball users don't need to regenerate it after make distclean (like > > *.vapi). > > > > What's the actual error you see when make dist? > > You could run 'make distcheck'. > > ERROR: files left in build directory after distclean: > ./data/dconf/00-upstream-settings OK, then I would rather make the $(gsettings_SCHEMAS) dependency to order-only: --- a/data/dconf/Makefile.am +++ b/data/dconf/Makefile.am @@ -55,7 +55,7 @@ org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.s --schema-id "org.freedesktop.ibus" \ --output $@ $< -00-upstream-settings: $(srcdir)/make-dconf-override-db.sh $(gsettings_SCHEMAS) +00-upstream-settings: $(srcdir)/make-dconf-override-db.sh | $(gsettings_SCHEMAS @$(MKDIR_P) db $(AM_V_GEN) $(srcdir)/make-dconf-override-db.sh > $@ || \ { rc=$$?; $(RM) -rf $@; exit $$rc; }
Sign in to reply to this message.
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
