[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] debian/debian-edu-config.postinst: Adjust condition. Closes: #982448)

[Wolfgang Schweer]

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


Commits:
faa6db46 by Wolfgang Schweer at 2021-02-10T17:47:10+01:00
debian/debian-edu-config.postinst: Adjust condition. Closes: #982448)

Avoid upgrade failure in case /etc/debian-edu/config happens to be empty.

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

- - - - -


2 changed files:

- debian/changelog
- debian/debian-edu-config.postinst


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+debian-edu-config (2.11.49) UNRELEASED; urgency=medium
+
+  * debian/debian-edu-config.postinst: Adjust condition. Closes: #982448)
+    - Avoid upgrade failure in case /etc/debian-edu/config happens to be empty.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 10 Feb 2021 17:27:57 +0100
+
 debian-edu-config (2.11.48) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/debian-edu-config.postinst
=====================================
@@ -163,7 +163,7 @@ configure)
     # changes take effect immediately after reboot (would take up to 15 minutes
     # otherwise). Exclude a plain main server and the gateway; the script
     # doesn't make sense in both cases and would taint network setup.
-	if ! grep -Eq "(Main-Server)" /etc/debian-edu/config ; then
+	if [ -s /etc/debian-edu/config ] && ! grep -Eq "(Main-Server)" /etc/debian-edu/config ; then
 		rm -f /etc/network/if-up.d/wpad-proxy-update
 		rm -f /etc/network/if-up.d/hostname
 		if [ -f /etc/network/interfaces ] && ! grep -q gateway /etc/hostname && \



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

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/faa6db46ccf2aa9b2b4e9be3e4bdb4323eca724f
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/20210210/ff900b8e/attachment-0001.html>