update to upstream 20150115

Change-Id: I8943d5a8c98049843e6753c38beac89927690d72

1 files changed, 4 insertions, 20 deletions

diff --git a/vc b/vc
index e9d8f55..66f3da0 100755
--- a/vc
+++ b/vc
@@ -8,7 +8,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 2 or 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -125,7 +125,7 @@ set +e
 		echo
 	fi
 	if [ -n "$message" ]; then
-		echo "- $message"
+		echo -e "- $message"
 		echo
 	elif [ -n "$content" ]; then
 		cat "$content"
@@ -133,24 +133,6 @@ set +e
 	elif [ ! $just_edit ]; then
 		echo "- "
 		echo
-		if [ -d .osc -a -n "$(which osc 2>/dev/null)" ]; then
-			OSC_STATUS="$(cd "$pkgpath" &> /dev/null; osc st)"
-			ADDED="$(sed -n 's/^A[[:blank:]]\+\([^[:blank:]].*\.\(patch\|diff\)\)$/  * \1/p' <<< "$OSC_STATUS")"
-			DELETED="$(sed -n 's/^D[[:blank:]]\+\([^[:blank:]].*\.\(patch\|diff\)\)$/  * \1/p' <<< "$OSC_STATUS")"
-			MODIFIED="$(sed -n 's/^M[[:blank:]]\+\([^[:blank:]].*\.\(patch\|diff\)\)$/  * \1/p' <<< "$OSC_STATUS")"
-			if [ -n "$ADDED" ]; then
-			    echo "- added patches:"
-			    echo "$ADDED"
-			fi
-			if [ -n "$DELETED" ]; then
-			    echo "- removed patches:"
-			    echo "$DELETED"
-			fi
-			if [ -n "$MODIFIED" ]; then
-			    echo "- modified patches:"
-			    echo "$MODIFIED"
-			fi
-		fi
 	fi
 	cat $changelog
 } >> "$tmpfile"
@@ -166,5 +148,7 @@ if [ -z "$message" ]; then
 	fi
 fi
 mode=`stat -c "%a" "$changelog"`
+user=`stat -c "%u:%g" "$changelog"`
 mv "$tmpfile" "$changelog"
 chmod $mode "$changelog"
+chown $user "$changelog"