Merge branch 'maint'

Remove gettext() function addition from gensync and updatesync in master as
gettext is no longer used in them anyway.

1 files changed, 7 insertions, 0 deletions

diff --git a/scripts/repo-remove.sh.in b/scripts/repo-remove.sh.in
index fe230b02..47a0d5ae 100644
--- a/scripts/repo-remove.sh.in
+++ b/scripts/repo-remove.sh.in
@@ -95,6 +95,13 @@ db_remove_entry() {
 
 # PROGRAM START
 
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 # check for help flags
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage