summaryrefslogtreecommitdiff
path: root/vc
diff options
context:
space:
mode:
authorAdrian Schröter <adrian@suse.de>2013-12-05 11:09:49 +0100
committerAdrian Schröter <adrian@suse.de>2013-12-05 11:09:49 +0100
commit1263b2d2e32daa9b4dc09268f6ac333fae0d1eb4 (patch)
tree1b2eca3f040abe0373f2ea43fdb09871550b52fd /vc
parent55e8632378afbaa8547ea996caaff0a2c22956cd (diff)
Revert "fix check for osc". It actually breaks it by adding dummy line to text
This reverts commit 6f9f48e88eea2d14a6ce5ba928de0d8ad972cba3.
Diffstat (limited to 'vc')
-rwxr-xr-xvc2
1 files changed, 1 insertions, 1 deletions
diff --git a/vc b/vc
index 9d60d64..7029f85 100755
--- a/vc
+++ b/vc
@@ -133,7 +133,7 @@ set +e
elif [ ! $just_edit ]; then
echo "- "
echo
- if [ -d .osc ] && which osc 2>/dev/null; then
+ 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")"