packages: ldap-account-manager/ldap-account-manager.spec - must check both ...

glen glen at pld-linux.org
Wed Nov 10 11:03:07 CET 2010


Author: glen                         Date: Wed Nov 10 10:03:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- must check both dir and link

---- Files affected:
packages/ldap-account-manager:
   ldap-account-manager.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: packages/ldap-account-manager/ldap-account-manager.spec
diff -u packages/ldap-account-manager/ldap-account-manager.spec:1.37 packages/ldap-account-manager/ldap-account-manager.spec:1.38
--- packages/ldap-account-manager/ldap-account-manager.spec:1.37	Wed Nov 10 10:58:32 2010
+++ packages/ldap-account-manager/ldap-account-manager.spec	Wed Nov 10 11:03:01 2010
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	LDAP Account Manager (LAM) - interfejs WWW do zarządzania kontami na serwerze LDAP
 Name:		ldap-account-manager
 Version:	2.9.0
-Release:	0.5
+Release:	0.7
 License:	GPL v2+
 Group:		Applications/WWW
 Source0:	http://dl.sourceforge.net/lam/%{name}-%{version}.tar.gz
@@ -178,13 +178,13 @@
 
 %pretrans
 # migrate dir to symlinks, don't worry about permissions, those be handled by rpm
-if [ -d %{_appdir}/sess ]; then
+if [ -d %{_appdir}/sess -a ! -L %{_appdir}/sess ]; then
 	install -d /var/lib/%{name}/sess
 	mv %{_appdir}/sess/* /var/lib/%{name}/sess 2>/dev/null
 	rm -rf %{_appdir}/sess
 	ln -sf /var/lib/%{name}/sess %{_appdir}/sess
 fi
-if [ -d %{_appdir}/tmp ]; then
+if [ -d %{_appdir}/tmp -a ! -L %{_appdir}/tmp ]; then
 	install -d /var/lib/%{name}/tmp
 	mv %{_appdir}/tmp/* /var/lib/%{name}/tmp 2>/dev/null
 	rm -rf %{_appdir}/tmp
@@ -281,6 +281,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2010/11/10 10:03:01  glen
+- must check both dir and link
+
 Revision 1.37  2010/11/10 09:58:32  glen
 - migrate sess and tmp to symlinks that rpm can't handle itself
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ldap-account-manager/ldap-account-manager.spec?r1=1.37&r2=1.38&f=u



More information about the pld-cvs-commit mailing list