Merge branch 'master' into auto-quirks

2 files changed, 10 insertions, 1 deletions

diff --git a/pm/functions.in b/pm/functions.in
index 5452fb4..2af9429 100644
--- a/pm/functions.in
+++ b/pm/functions.in
@@ -231,3 +231,12 @@ add_parameters() {
 get_parameters() {
        cat "$PARAMETERS"
 }
+
+# check to see if a single parameter exists
+has_parameter()
+{
+	for p in $PARAMETERS; do
+		[ "$p" = "$1" ] && return 0
+	done
+	return 1
+}
diff --git a/pm/pm-functions.in b/pm/pm-functions.in
index ce79619..f7492a0 100644
--- a/pm/pm-functions.in
+++ b/pm/pm-functions.in
@@ -84,7 +84,7 @@ fi
 # We do it this way because 'echo -n' is not posix.
 log()
 {
-	[ $LOGGING ] || return;
+	[ $LOGGING ] || return 0;
 	local fmt='%s\n'
 	[ "$1" = "-n" ] && { fmt='%s'; shift; }
 	printf "$fmt" "$*"