summaryrefslogtreecommitdiff
path: root/extra/gconf/gsettings-schema-convert-dont-fail.patch
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-03-14 00:05:24 -0700
committerroot <root@rshg054.dnsready.net>2013-03-14 00:05:24 -0700
commit3ff20dedff636571ad0faa4736af5b23e4623ffe (patch)
treeab4a70fe4e4a9113ff3483d8635eb46f8994c12a /extra/gconf/gsettings-schema-convert-dont-fail.patch
parent3efd178c050d911cfdff7e8d2ed4886b98b08b98 (diff)
Thu Mar 14 00:05:23 PDT 2013
Diffstat (limited to 'extra/gconf/gsettings-schema-convert-dont-fail.patch')
-rw-r--r--extra/gconf/gsettings-schema-convert-dont-fail.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/extra/gconf/gsettings-schema-convert-dont-fail.patch b/extra/gconf/gsettings-schema-convert-dont-fail.patch
deleted file mode 100644
index 92040b343..000000000
--- a/extra/gconf/gsettings-schema-convert-dont-fail.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 02f12f41b031a1c2672e7cf1cb8ebde58288c547 Mon Sep 17 00:00:00 2001
-From: Guido Günther <agx@sigxcpu.org>
-Date: Thu, 23 Feb 2012 20:14:18 +0000
-Subject: gsettings-schema-convert: Don't fail to convert lists without default element
-
----
-diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert
-index a60dc35..913cc83 100755
---- a/gsettings/gsettings-schema-convert
-+++ b/gsettings/gsettings-schema-convert
-@@ -854,11 +854,10 @@ class GConfSchema:
- # Fix the default value to be parsable by GVariant
- if self.type == 'list':
- l = self.default.strip()
-- if not (l[0] == '[' and l[-1] == ']'):
-- if not l:
-- l = '[]'
-- else:
-- raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
-+ if not l:
-+ l = '[]'
-+ elif not (l[0] == '[' and l[-1] == ']'):
-+ raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
- values = l[1:-1].strip()
- if not values:
- self.default = '[]'
---
-cgit v0.9.0.2