[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 3 commits: debian/debian-edu-config.postinst: Don't run the cert tool inside d-i.

[WolfgangSchweer]

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


Commits:
0bd0a7a7 by Wolfgang Schweer at 2018-12-30T12:16:37Z
debian/debian-edu-config.postinst: Don't run the cert tool inside d-i.

- - - - -
fbac2548 by Wolfgang Schweer at 2018-12-30T12:18:52Z
share/debian-edu-config/tools/install-task-pkgs: Drop superfluous last apt call.

- - - - -
844c2148 by Wolfgang Schweer at 2018-12-30T12:21:13Z
share/debian-edu-config/tools/improve-desktop-l10n: Fix special case en.

- - - - -


3 changed files:

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


Changes:

=====================================
debian/debian-edu-config.postinst
=====================================
@@ -121,7 +121,8 @@ configure)
             if [ -f /etc/ldap/slapd-debian-edu.conf ] ; then
                 ln -s /etc/ldap/slapd-debian-edu.conf /etc/ldap/slapd.conf
             fi
-            if [ -f /usr/share/debian-edu-config/tools/create-debian-edu-certs ] ; then
+            if [ -f /usr/share/debian-edu-config/tools/create-debian-edu-certs ] && \
+                ! running_from_di ; then
                 /usr/share/debian-edu-config/tools/create-debian-edu-certs --force-overwrite
             fi
         else


=====================================
share/debian-edu-config/tools/improve-desktop-l10n
=====================================
@@ -14,7 +14,8 @@ for lang in $(echo $langsfull) ; do
         if ! [ -z "$(apt-cache search $i-$baselang-$langcountry)" ]; then
             apt-get -yq install $i-$baselang-$langcountry
         else
-            if ! [ -z "$(apt-cache search $i-$baselang)" ]; then
+            if ! [ -z "$(apt-cache search $i-$baselang)" ] && \
+                ! [ "thunderbird-l10n-en" = "$i-$baselang" ] ; then
                 apt-get -y install $i-$baselang
         fi
         fi


=====================================
share/debian-edu-config/tools/install-task-pkgs
=====================================
@@ -210,4 +210,3 @@ for d in gnome kde mate lxde lxqt xfce ; do
 	    apt-get -yq install task-$d-desktop
 	fi
 done
-apt-get -yq install task-desktop



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/210aa0bcf5d43f83c28578a4673060b55edb6274...844c214839b54b5802ee8d6916aa2afd3ff2503f

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/210aa0bcf5d43f83c28578a4673060b55edb6274...844c214839b54b5802ee8d6916aa2afd3ff2503f
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/20181230/5b5cc786/attachment-0001.html>