[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] schroot-create: also update the diffoscope-minimal together with diffoscope

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
eb38395f by Mattia Rizzolo at 2022-02-09T12:05:34+01:00
schroot-create: also update the diffoscope-minimal together with diffoscope

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- bin/schroot-create.sh


Changes:

=====================================
bin/schroot-create.sh
=====================================
@@ -113,14 +113,14 @@ install_diffoscope() {
 		echo "deb $MIRROR unstable main" | sudo tee -a "$SCHROOT_TARGET/etc/apt/sources.list" > /dev/null
 		robust_chroot_apt update
 		# install diffoscope from unstable without re-adding all recommends...
-		sudo chroot "$SCHROOT_TARGET" apt-get install -y -t unstable ${diffoscope_installed+--no-install-recommends} diffoscope || echo "Warning: diffoscope from unstable is uninstallable at the moment."
+		sudo chroot "$SCHROOT_TARGET" apt-get install -y -t unstable ${diffoscope_installed+--no-install-recommends} diffoscope diffoscope-minimal || echo "Warning: diffoscope from unstable is uninstallable at the moment."
 	fi
 
 	if [ "$SUITE" != "experimental" ]; then
 		echo "deb $MIRROR experimental main" | sudo tee -a "$SCHROOT_TARGET/etc/apt/sources.list" > /dev/null
 		robust_chroot_apt update
 		# install diffoscope from experimental without re-adding all recommends...
-		sudo chroot "$SCHROOT_TARGET" apt-get install -y -t experimental ${diffoscope_installed+--no-install-recommends} diffoscope || echo "Warning: diffoscope from experimental is uninstallable at the moment."
+		sudo chroot "$SCHROOT_TARGET" apt-get install -y -t experimental ${diffoscope_installed+--no-install-recommends} diffoscope diffoscope-minimal || echo "Warning: diffoscope from experimental is uninstallable at the moment."
 	fi
 
 	# if diffoscope is still not installed, the next apt-get install
@@ -226,7 +226,7 @@ bootstrap() {
 		if ! $DEBUG ; then set +x ; fi
 		if [ "$1" = "diffoscope" ] ; then
 			echo
-			sudo chroot "$SCHROOT_TARGET" dpkg -l diffoscope
+			sudo chroot "$SCHROOT_TARGET" dpkg -l "diffoscope*"
 			echo
 		fi
 		sudo umount -l "$SCHROOT_TARGET/proc"



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/eb38395f9c0369cae0eb6d4f3cc16e6366c6ddf9
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/20220209/216cf796/attachment-0001.htm>