/pidgin/main: 5167fa79481b: Backport 843aba5973db to 2.x.y

[Tomasz Wasilczyk]

Changeset: 5167fa79481b473030c722496c5eba1115c5f223
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-19 13:25 +0100
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/5167fa79481b

Description:

Backport 843aba5973db to 2.x.y

diffstat:

 libpurple/gconf/Makefile.am |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/libpurple/gconf/Makefile.am b/libpurple/gconf/Makefile.am
--- a/libpurple/gconf/Makefile.am
+++ b/libpurple/gconf/Makefile.am
@@ -10,7 +10,7 @@ schema_DATA = $(schema_in_files:.schemas
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \
-		grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2
+		grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 || true
 else
 install-data-local:
 endif #GCONF_SCHEMAS_INSTALL