[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: More completely disable usrmerge.

[Vagrant Cascadian (@vagrant)]

Vagrant Cascadian pushed to branch master at Debian QA / jenkins.debian.net


Commits:
9951365b by Vagrant Cascadian at 2023-06-18T13:39:01-07:00
reproducible Debian: More completely disable usrmerge.

Otherwise, the 2nd build fails with:

I: user script /srv/workspace/pbuilder/3491/tmp/hooks/A99_set_merged_usr starting
Re-configuring usrmerge...
removed '/etc/unsupported-skip-usrmerge-conversion'
dpkg-query: package 'usrmerge' is not installed and no information is available
Use dpkg --info (= dpkg-deb --info) to examine archive files.
/usr/sbin/dpkg-reconfigure: usrmerge is not installed

- - - - -


1 changed file:

- hosts/common/etc/pbuilder/rebuild-hooks/A99_set_merged_usr


Changes:

=====================================
hosts/common/etc/pbuilder/rebuild-hooks/A99_set_merged_usr
=====================================
@@ -4,11 +4,11 @@
 
 set -eu
 
-if [ "$DISTRIBUTION" != stretch ] && [ "$DISTRIBUTION" != buster ] && [ "$DISTRIBUTION" != bullseye ]; then
-    echo "Re-configuring usrmerge..."
+# if [ "$DISTRIBUTION" != stretch ] && [ "$DISTRIBUTION" != buster ] && [ "$DISTRIBUTION" != bullseye ]; then
+#     echo "Re-configuring usrmerge..."
 
-    rm -fv /etc/unsupported-skip-usrmerge-conversion
-    dpkg-reconfigure usrmerge
-else
+#     rm -fv /etc/unsupported-skip-usrmerge-conversion
+#     dpkg-reconfigure usrmerge
+# else
     echo "Not re-configuring usrmerge for $DISTRIBUTION"
-fi
+#fi



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/9951365b854660b4c3ea770c11414f254c50151a
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/20230618/10ffb41e/attachment-0001.htm>