From a94906852f983d71d7b022f402ba74c7e9c90bad Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 27 Nov 2017 13:22:32 -0800 Subject: [PATCH] fix autobuild change detection for two OS trees --- bin/freeside-debian-releases.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index 13dbccea3..4e42c231f 100755 --- a/bin/freeside-debian-releases.sh +++ b/bin/freeside-debian-releases.sh @@ -11,7 +11,7 @@ if [[ $# -ne 3 ]] fi DATE=`date +"%Y%m%d%H"` -DIR="/home/autobuild/packages/staging/freeside$FS_VERSION/$FS_REPO" +DIR="/home/autobuild/packages/staging/freeside$FS_VERSION/$DISTRO/$FS_REPO" TARGET="/home/autobuild/public_html/freeside$FS_VERSION-$DISTRO-$FS_REPO" if [ ! -d "$DIR" -a -d $TARGET ]; then @@ -22,9 +22,6 @@ fi GIT_VERSION=`grep '^$VERSION' $DIR/freeside/FS/FS.pm | cut -d\' -f2` -# Clean configuration file -rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles - # Pull any changes cd $DIR/freeside git checkout -- debian/changelog -- 2.11.0