[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: d/debian-edu-config.postinst: Fix code to remove the /etc/smbldap-tools directory

[Wolfgang Schweer (@schweer-guest)]

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


Commits:
5844d93e by Wolfgang Schweer at 2021-10-21T18:55:23+02:00
d/debian-edu-config.postinst: Fix code to remove the /etc/smbldap-tools directory

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

- - - - -
2ddfb788 by Wolfgang Schweer at 2021-10-21T19:01:49+02:00
cf3/promises.cf: Remove the debian-edu/cf.ldapscripts entry from the inputs list

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

- - - - -


3 changed files:

- cf3/promises.cf
- debian/changelog
- debian/debian-edu-config.postinst


Changes:

=====================================
cf3/promises.cf
=====================================
@@ -90,7 +90,6 @@ body common control
                   "debian-edu/cf.krb5client",
                   "debian-edu/cf.ldapserver",
                   "debian-edu/cf.ldapclient",
-                  "debian-edu/cf.ldapscripts",
                   "debian-edu/cf.ntp",
                   "debian-edu/cf.pxeinstall",
                   "debian-edu/cf.squid",


=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+debian-edu-config (2.12.7) UNRELEASED; urgency=medium
+
+  * debian/debian-edu-config.postinst:
+    - Fix code to remove the /etc/smbldap-tools directory.
+  * cf3/promises.cf:
+    - Remove the debian-edu/cf.ldapscripts entry from the inputs list.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 21 Oct 2021 17:43:24 +0200
+
 debian-edu-config (2.12.6) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/debian-edu-config.postinst
=====================================
@@ -166,10 +166,10 @@ configure)
 		rm -f /etc/ldap/slapd-debian-edu.conf
 	fi
 	# Cleanup from smbldap-tools and ldapscripts related files.
-	if dpkg --compare-versions "$2" le "2.12.5" ; then
+	if dpkg --compare-versions "$2" le "2.12.6" ; then
 		rm -f /etc/ldapscripts/*.cf-before-edit
 		rm -f /etc/smbldap-tools/*
-		if -d /etc/smbldap-tools ; then
+		if [ -d /etc/smbldap-tools ] ; then
 			rmdir /etc/smbldap-tools
 		fi
 	fi



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/b15d4f8e168bc4c98dfd31a04e9c4faa2258a5fb...2ddfb78890d7159667aa07c40dc9aaae69b00df5

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/b15d4f8e168bc4c98dfd31a04e9c4faa2258a5fb...2ddfb78890d7159667aa07c40dc9aaae69b00df5
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/20211021/cb394bdd/attachment-0001.htm>