[Pkg-cups-devel] r58 - cupsys/branches/cups-1.2/debian

[Kenshi Muto]

Author: kmuto
Date: Wed Dec 14 21:56:35 2005
New Revision: 58

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.config
Log:
add timeout routine to avoid lockup

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Dec 14 21:56:35 2005
@@ -36,6 +36,7 @@
   [ Kenshi Muto ]
   * Updated Russian debconf translation, taken from cupsys trunk.
   * Downgrade port and browse question to low.
+  * Add timeout routine to avoid lockup.
 
  -- Kenshi Muto <kmuto at debian.org>  Thu, 15 Dec 2005 05:48:20 +0900
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.config
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.config	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.config	Wed Dec 14 21:56:35 2005
@@ -89,9 +89,15 @@
   db_input low cupsys/ports || true
   db_go
   db_get cupsys/ports
+  STATE=0
   while ! is_ports "$RET"; do
     db_input critical cupsys/portserror || true
     db_go
+    STATE=$(expr $STATE + 1)
+    if [ "$STATE" = "5" ]; then
+      echo "Illegal port value for CUPS. Please correct this by running 'dpkg-reconfigure cupsys'."
+      exit 1
+    fi
     db_input high cupsys/ports || true
     db_go
     db_get cupsys/ports
@@ -111,9 +117,15 @@
   db_input low cupsys/ports || true
   db_go
   db_get cupsys/ports
+  STATE=0
   while ! is_ports "$RET"; do
     db_input critical cupsys/portserror || true
     db_go
+    STATE=$(expr $STATE + 1)
+    if [ "$STATE" = "5" ]; then
+      echo "Illegal port value for CUPS. Please correct this by running 'dpkg-reconfigure cupsys'."
+      exit 1
+    fi
     db_input low cupsys/ports || true
     db_go
     db_get cupsys/ports