From 8f3c9be9bae336fe90c08ab783fee92645e1003c Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 6 Jan 2009 19:20:37 +0100 Subject: pkg: vcs_upgrade: Fixed parameter name --- bin/pkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/pkg b/bin/pkg index 0b0a0c2..519bfe1 100755 --- a/bin/pkg +++ b/bin/pkg @@ -232,9 +232,9 @@ function vcs_upgrade { typeset IFS=$'\n' line typeset -i merge_ok=0 for line in $(git branch); { - [[ $line == '* master' ]] && ok=1 + [[ $line == '* master' ]] && merge_ok=1 } - if ((ok)) { + if ((merge_ok)) { git pull $PKG_ROOT/${PWD:t} master } else { git fetch $PKG_rOOT/${PWD:t} master -- cgit v1.2.3