packages: php-dirs/php-dirs.spec, php-dirs/php-session.sh - don't force 1h ...

[gotar]

Author: gotar                        Date: Sun Oct 31 00:41:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force 1h if no time found, use only larger value! rel. 9

---- Files affected:
packages/php-dirs:
   php-dirs.spec (1.19 -> 1.20) , php-session.sh (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/php-dirs/php-dirs.spec
diff -u packages/php-dirs/php-dirs.spec:1.19 packages/php-dirs/php-dirs.spec:1.20
--- packages/php-dirs/php-dirs.spec:1.19	Thu Jan 21 19:33:57 2010
+++ packages/php-dirs/php-dirs.spec	Sun Oct 31 02:41:10 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Wspólne katalogi dla różnych wersji PHP
 Name:		php-dirs
 Version:	1.1
-Release:	8
+Release:	9
 License:	GPL
 Group:		Base
 Source0:	php-session.sh
@@ -58,6 +58,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/10/31 00:41:10  gotar
+- don't force 1h if no time found, use only larger value! rel. 9
+
 Revision 1.19  2010/01/21 18:33:57  gotar
 - do not R fucking tmpwatch!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   not in package R by php itself, do it in php-tmpwatch/tmpwatch-php or any

================================================================
Index: packages/php-dirs/php-session.sh
diff -u packages/php-dirs/php-session.sh:1.5 packages/php-dirs/php-session.sh:1.6
--- packages/php-dirs/php-session.sh:1.5	Thu Jan 21 19:33:57 2010
+++ packages/php-dirs/php-session.sh	Sun Oct 31 02:41:10 2010
@@ -14,12 +14,8 @@
 	RUNTIME4=$(awk -F"=" '/^session.gc_maxlifetime[ \t]*=/ { t=sprintf("%d", ($2/3600)); if (t<1) { t=1; }; print t; exit;}' /etc/php4/php.ini)
 fi
 
-[ -z "$RUNTIME5" ] && RUNTIME5="1h"
+[ -z "$RUNTIME5" ] && [ -z "$RUNTIME4" ] && exit
 
-if [ -n "$RUNTIME5" ]; then
-	/usr/sbin/tmpwatch ${RUNTIME5} /var/run/php
-fi
+[ "${RUNTIME4:-0}" -ge "${RUNTIME5:-0}" ] && RUNTIME=$((RUNTIME4)) || RUNTIME=$((RUNTIME5))
 
-if [ -n "$RUNTIME4" -a "$RUNTIME5" != "$RUNTIME4" ]; then
-	/usr/sbin/tmpwatch ${RUNTIME4} /var/run/php
-fi
+/usr/sbin/tmpwatch ${RUNTIME} /var/run/php
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-dirs/php-dirs.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-dirs/php-session.sh?r1=1.5&r2=1.6&f=u