From cf82a52beffc116777853b364525d960badce291 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 13 Oct 2008 19:38:21 +0000 Subject: [PATCH] Fix partial upload that includes -common git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8778 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- tools/build/stage | 2 +- tools/build/upload | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/stage b/tools/build/stage index 773a77d6a..6ddf0bafd 100755 --- a/tools/build/stage +++ b/tools/build/stage @@ -198,7 +198,7 @@ esac [ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt -[ -n "$PARTIAL" ] && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1} +[ -n "$PARTIAL" -a -z "$UPLOADCOMMON" ] && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1} cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt diff --git a/tools/build/upload b/tools/build/upload index fefada609..16d913475 100755 --- a/tools/build/upload +++ b/tools/build/upload @@ -194,7 +194,7 @@ fi [ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt -[ -n "$PARTIAL" ] && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1} +[ -n "$PARTIAL" -a -z "$UPLOADCOMMON" ] && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1} cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt