Updated version 1.5.2 from 'upstream/jessie/1.5.2'

with Debian dir 68aaa0295161d08a42f570c3345fcf934f50c906

PKG-INFO

 Metadata-Version: 1.0
 Name: pidp.tools
-Version: 1.5.1
+Version: 1.5.2
 Summary: PETRA III Debian Package Tools
 Home-page: https://stash.desy.de/projects/JMK/repos/pidptools/browse/
 Author: Jan Kotanski

pidpbuild

@@ -17,7 +17,7 @@
 #    along with nexdatas.  If not, see <http://www.gnu.org/licenses/>.
 #
 set -e
-PIDPVERSION="1.5.1"
+PIDPVERSION="1.5.2"
 for i in "${@:1}"
 do
     if [[ $i == -* ]] ; then

pidpclone

@@ -16,7 +16,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with nexdatas.  If not, see <http://www.gnu.org/licenses/>.
 #
-PIDPVERSION="1.5.1"
+PIDPVERSION="1.5.2"
 for i in "${@:1}"
 do
     if [[ $i == -* ]] ; then
@@ -136,11 +136,12 @@ else
     git fetch --all
     if ! [[ -z $TEMPRELEASE ]] ; then
 	echo "TEMPLATE RELEASE: $TEMPRELEASE"
-	if [[  $(git checkout -b upstream/$TEMPRELEASE origin/upstream/$TEMPRELEASE > /dev/null 2>&1) && $? ]]; then
-	    git checkout upstream/$TEMPRELEASE
-	    if [[ -z $NOPULL ]] ; then
-		git pull origin upstream/$TEMPRELEASE
-	    fi
+	set +e
+	git checkout -b upstream/$TEMPRELEASE origin/upstream/$TEMPRELEASE
+	set -e
+	git checkout upstream/$TEMPRELEASE
+	if [[ -z $NOPULL ]] ; then
+	    git pull origin upstream/$TEMPRELEASE
 	fi
 	git checkout -b upstream/$RELEASE
 	TEMPTAGS=(`git tag | grep upstream/$TEMPRELEASE`)
@@ -154,22 +155,19 @@ else
 	done
 	# git config branch.upstream/$RELEASE.remote origin
 	# git config branch.upstream/$RELEASE.merge refs/heads/upstream/$RELEASE
-	if [[  $(git checkout -b pristine-tar origin/pristine-tar > /dev/null 2>&1) && $? ]]; then
-	    git checkout pristine-tar
-	    if [[ -z $NOPULL ]] ; then
-		git pull origin pristine-tar
-	    fi
+	set +e
+	git checkout -b pristine-tar origin/pristine-tar
+	set -e
+	git checkout pristine-tar
+	if [[ -z $NOPULL ]] ; then
+	    git pull origin pristine-tar
 	fi
-	if [[  $(git checkout -b debian/$TEMPRELEASE origin/debian/$TEMPRELEASE > /dev/null 2>&1) && $? ]]; then
-	    if [[ -z $NOPULL ]] ; then
-		git pull origin debian/$TEMPRELEASE
-	    fi
-	else
-	    git checkout debian/$TEMPRELEASE
-	    if [[ -z $NOPULL ]] ; then
-		git pull origin debian/$TEMPRELEASE
-	    fi
-	    
+	set +e
+	git checkout -b debian/$TEMPRELEASE origin/debian/$TEMPRELEASE
+	set -e
+	git checkout debian/$TEMPRELEASE
+	if [[ -z $NOPULL ]] ; then
+	    git pull origin debian/$TEMPRELEASE
 	fi
 	git checkout -b debian/$RELEASE
 	TEMPTAGS=(`git tag | grep debian/$TEMPRELEASE`)
@@ -183,27 +181,26 @@ else
 	# git config branch.debian/$RELEASE.remote origin
 	# git config branch.debian/$RELEASE.merge refs/heads/debian/$RELEASE
     else
-	if [[  $(git checkout -b upstream/$RELEASE origin/upstream/$RELEASE > /dev/null 2>&1) && $? ]]; then
-	    git checkout upstream/$RELEASE
-	    if [[ -z $NOPULL ]] ; then
-		git pull origin upstream/$RELEASE
-	    fi
+	set +e
+	git checkout -b upstream/$RELEASE origin/upstream/$RELEASE
+	set -e
+	git checkout upstream/$RELEASE
+	if [[ -z $NOPULL ]] ; then
+	    git pull origin upstream/$RELEASE
 	fi
-	if [[  $(git checkout -b pristine-tar origin/pristine-tar > /dev/null 2>&1) && $? ]]; then
-	    git checkout pristine-tar
-	    if [[ -z $NOPULL ]] ; then
-		git pull origin pristine-tar
-	    fi
+	set +e
+	git checkout -b pristine-tar origin/pristine-tar
+	set -e
+	git checkout pristine-tar
+	if [[ -z $NOPULL ]] ; then
+	    git pull origin pristine-tar
 	fi
-	if [[  $(git checkout -b debian/$RELEASE origin/debian/$RELEASE > /dev/null 2>&1) && $? ]]; then
-	    if [[ -z $NOPULL ]] ; then
-		git pull origin debian/$RELEASE
-	    fi
-	else
-	    git checkout debian/$RELEASE
-	    if [[ -z $NOPULL ]] ; then
-		git pull origin debian/$RELEASE
-	    fi
+	set +e
+	git checkout -b debian/$RELEASE origin/debian/$RELEASE
+	set -e
+	git checkout debian/$RELEASE
+	if [[ -z $NOPULL ]] ; then
+	    git pull origin debian/$RELEASE
 	fi
     fi
     git clean -f -d

pidpcreate

@@ -17,7 +17,7 @@
 #    along with nexdatas.  If not, see <http://www.gnu.org/licenses/>.
 #
 set -e
-PIDPVERSION="1.5.1"
+PIDPVERSION="1.5.2"
 for i in "${@:1}"
 do
     if [[ $i == -* ]] ; then

pidppush

@@ -17,7 +17,7 @@
 #    along with nexdatas.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-PIDPVERSION="1.5.1"
+PIDPVERSION="1.5.2"
 for i in "${@:1}"
 do
     if [[ $i == -* ]] ; then

setup.py

@@ -30,7 +30,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 #: (:obj:`str`) full release number
-release = "1.5.1"
+release = "1.5.2"
 
 #: (:obj:`dict` <:obj:`str` , any >`) metadata for distutils
 SETUPDATA = dict(