projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
899f67d
)
fix release script
author
Ivan Kohler
<ivan@freeside.biz>
Fri, 4 Mar 2016 02:06:13 +0000
(18:06 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Fri, 4 Mar 2016 02:06:13 +0000
(18:06 -0800)
bin/freeside-debian-releases.sh
patch
|
blob
|
history
diff --git
a/bin/freeside-debian-releases.sh
b/bin/freeside-debian-releases.sh
index
e832d91
..
03a163a
100644
(file)
--- 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
# 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
#Assign the proper config files for freeside-ng-selfservice
if [ $DISTRO = "wheezy" ]; then