[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Don't rely on package availability for each arch autopkgtest is run on

[Wolfgang Schweer (@schweer-guest)]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
042383b9 by Wolfgang Schweer at 2021-10-25T01:16:48+02:00
Don't rely on package availability for each arch autopkgtest is run on

Adjust share/debian-edu-config/tools/{improve-desktop-l10n,install-task-pkgs}

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


3 changed files:

- debian/changelog
- share/debian-edu-config/tools/improve-desktop-l10n
- share/debian-edu-config/tools/install-task-pkgs


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+debian-edu-config (2.12.10) UNRELEASED; urgency=medium
+
+  * share/debian-edu-config/tools/{improve-desktop-l10n,install-task-pkgs}:
+    - Don't rely on package availability for each arch autopkgtest is run on.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 25 Oct 2021 00:46:56 +0200
+
 debian-edu-config (2.12.9) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
share/debian-edu-config/tools/improve-desktop-l10n
=====================================
@@ -15,7 +15,7 @@ for lang in $langsfull ; do
     langcountry="$(echo ${lang%.*}|cut -d'_' -f2 | tr '[:upper:]' '[:lower:]')"
     for i in debian-edu-doc debian-edu-doc-legacy gimp-help thunderbird-l10n; do
         if ! [ -z "$(apt-cache search $i-$baselang-$langcountry)" ] && ! deb_installed $i-$baselang-$langcountry ; then
-            apt-get -yq install $i-$baselang-$langcountry
+            apt-get -yq install $i-$baselang-$langcountry || true
         else
             if ! [ -z "$(apt-cache search $i-$baselang)" ] && \
                 ! [ "thunderbird-l10n-en" = "$i-$baselang" ] && ! deb_installed $i-$baselang ; then
@@ -27,15 +27,16 @@ for lang in $langsfull ; do
     # special cases nn_NO and nb_NO (debian-edu-doc and gimp-help).
     if [ "nn" = "$baselang" ] && [ "no" = "$langcountry" ] && \
         ! [ -z "$(apt-cache search debian-edu-doc-nb-no)" ] && ! deb_installed debian-edu-doc-nb-no ; then
-            apt-get -yq install debian-edu-doc-nb-no
+            apt-get -yq install debian-edu-doc-nb-no || true
     fi
     if [ "nn" = "$baselang" ] && [ "no" = "$langcountry" ] && \
         ! [ -z "$(apt-cache search debian-edu-doc-legacy-nb-no)" ] && ! deb_installed debian-edu-doc-legacy-nb-no; then
-            apt-get -yq install debian-edu-doc-legacy-nb-no
+            apt-get -yq install debian-edu-doc-legacy-nb-no || true
     fi
     if [ "nb" = "$baselang" ] && [ "no" = "$langcountry" ] && \
         ! [ -z "$(apt-cache search gimp-help-nn)" ] && ! deb_installed install gimp-help-nn ; then
-            apt-get -yq install gimp-help-nn
+            # caveat: gimp might be missing for some archs.
+            apt-get -yq install gimp-help-nn || true
     fi
 done
 


=====================================
share/debian-edu-config/tools/install-task-pkgs
=====================================
@@ -10,17 +10,17 @@ set -e
 
 install_pkg1() {
 	if ! deb_installed "$pkg1" ; then
-		apt-get install -yq "$pkg1"
+		apt-get install -yq "$pkg1" || true
 	fi
 }
 install_pkg2() {
 	if ! deb_installed "$pkg2" ; then
-		apt-get install -yq "$pkg2"
+		apt-get install -yq "$pkg2" || true
 	fi
 }
 install_pkg3() {
 	if ! deb_installed "$pkg3" ; then
-		apt-get install -yq "$pkg3"
+		apt-get install -yq "$pkg3" || true
 	fi
 }
 install_pkg123() {
@@ -98,9 +98,9 @@ for lang in $langsfull ; do
 		pkg2=
 		install_pkg1
 		install_pkg2
-		apt-get install -y task-dzongkha-desktop
+		apt-get install -y task-dzongkha-desktop || true
 		if dpkg -l education-desktop-kde 1>/dev/null ; then
-		apt-get -yq install task-dzongkha-kde-desktop
+		apt-get -yq install task-dzongkha-kde-desktop || true
 		fi
 		;;
 		id)
@@ -246,6 +246,6 @@ done
 # finally the stock desktop tasks
 for d in cinnamon gnome kde mate lxde lxqt xfce ; do
 	if dpkg -l education-desktop-$d 1>/dev/null ; then
-	apt-get -yq install task-$d-desktop
+	apt-get -yq install task-$d-desktop || true
 	fi
 done



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/042383b906dd5fc13dcd542411e5002416a19ec2

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/042383b906dd5fc13dcd542411e5002416a19ec2
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/debian-edu-commits/attachments/20211024/07ac9f3e/attachment-0001.htm>