[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: fix typo which prevented usrmerge variation on unstable....

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
4d69f583 by Holger Levsen at 2020-05-08T19:19:38+02:00
reproducible Debian: fix typo which prevented usrmerge variation on unstable. also document that usrmerge is not varied in buster and stretch

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/reproducible_build.sh
- bin/reproducible_common.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -697,9 +697,9 @@ EOF
 
 	local pbuilder_options=()
 	case "${SUITE}" in
-		(unstable|experimental|bullseye)
-			pbuilder_options+=(--extrapackages usrmerge)
-			;;
+		stretch|buster)		;;
+		*)			pbuilder_options+=(--extrapackages usrmerge)
+					;;
 	esac
 	DEBBUILDOPTS="-b"
 	BINARYTARGET=""


=====================================
bin/reproducible_common.sh
=====================================
@@ -504,7 +504,7 @@ write_variation_table() {
 		write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
 		write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
 		write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
-		write_page "<tr><td><em><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td>no</td><td>yes</td></tr>"
+		write_page "<tr><td><em><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td>no</td><td>yes <em>(not varied for stretch/buster)</em></td></tr>"
 		write_page "<tr><td>build path</td><td>/build/1st/\$pkg-\$ver <em>(not varied for stretch/buster)</em></td><td>/build/2/\$pkg-\$ver/2nd <em>(not varied for stretch/buster)</em></td></tr>"
 		write_page "<tr><td>user's login shell</td><td>/bin/sh</td><td>/bin/bash</td></tr>"
 		write_page "<tr><td>user's <a href="https://en.wikipedia.org/wiki/Gecos_field">GECOS</a></td><td>first user,first room,first work-phone,first home-phone,first other</td><td>second user,second room,second work-phone,second home-phone,second other</td></tr>"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/4d69f583e1d66da1e8aa4d9fa02c7d2b8a92b5a7

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/4d69f583e1d66da1e8aa4d9fa02c7d2b8a92b5a7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20200508/c4bc8b88/attachment-0001.html>