Commit d0a635d6 authored by Holger Levsen's avatar Holger Levsen
Browse files

rdn: deal correctly with binNMU versions

parent 7058a802
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
SOURCE=$(basename "$1" | cut -d_ -f1)
VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
set +x
echo
echo "+------------------------------------------------------------------------------+"
echo "| Finished running debrebuild                  $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
+8 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
SOURCE=$(basename "$1" | cut -d_ -f1)
VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
set +x
echo
echo "+------------------------------------------------------------------------------+"
echo "| Finished running debrebuild                  $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
+8 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
SOURCE=$(basename "$1" | cut -d_ -f1)
VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
set +x
echo
echo "+------------------------------------------------------------------------------+"
echo "| Finished running debrebuild                  $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
+8 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
SOURCE=$(basename "$1" | cut -d_ -f1)
VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
set +x
echo
echo "+------------------------------------------------------------------------------+"
echo "| Finished running debrebuild                  $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
+8 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
SOURCE=$(basename "$1" | cut -d_ -f1)
VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
# take VERSION from .buildinfo file name but drop +bX suffix from binNMUs
VERSION=$(basename "$1" | cut -d_ -f2 | sed -r -e 's#\+b[[:digit:]]+$##g')
echo Source: $SOURCE
echo Source: $VERSION
echo
@@ -42,3 +43,9 @@ echo
echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
set +x
echo
echo "+------------------------------------------------------------------------------+"
echo "| Finished running debrebuild                  $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
Loading