[freeside-commits] branch FREESIDE_4_BRANCH updated. 96f83a393859a7cbe95473467250b0c60d53aa4a

Ivan ivan at 420.am
Thu Mar 3 18:06:13 PST 2016


The branch, FREESIDE_4_BRANCH has been updated
       via  96f83a393859a7cbe95473467250b0c60d53aa4a (commit)
      from  899f67d3eb3b5d7815a13235d851e116cb301a6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 96f83a393859a7cbe95473467250b0c60d53aa4a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Mar 3 18:06:13 2016 -0800

    fix release script

diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh
index e832d91..03a163a 100644
--- a/bin/freeside-debian-releases.sh
+++ b/bin/freeside-debian-releases.sh
@@ -27,7 +27,9 @@ rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles
 
 # Pull any changes
 cd $DIR/freeside
-STATUS=`git pull`
+git checkout -- debian/changelog
+git pull
+#STATUS=`git pull`
 
 #Assign the proper config files for freeside-ng-selfservice
 if [ $DISTRO = "wheezy" ]; then

-----------------------------------------------------------------------

Summary of changes:
 bin/freeside-debian-releases.sh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)




More information about the freeside-commits mailing list