[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r632 - trunk/debian



Author: dnusinow
Date: 2005-09-27 21:18:40 -0500 (Tue, 27 Sep 2005)
New Revision: 632

Modified:
   trunk/debian/changelog
   trunk/debian/xserver-xorg.postinst.in
Log:
* Don't choke when the user doesn't select a video mode. (closes: #322902)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-09-28 01:56:15 UTC (rev 631)
+++ trunk/debian/changelog	2005-09-28 02:18:40 UTC (rev 632)
@@ -38,6 +38,7 @@
   * Update general/055_lnx_evdev_keyboard.diff to properly use the "less
     greater bar"-key (EV_KEY_102ND) on a pc102 keyboards. Thanks Pär
     Andersson. (closes: #322253)
+  * Don't choke when the user doesn't select a video mode. (closes: #322902)
 
   [ Branden Robinson ]
   * Change xserver-xorg and xserver-xorg-dbg's recommendation of "discover1"
@@ -51,7 +52,7 @@
   * Updated Czech translation (cs.po). Thanks, Miroslav Kure (closes:
     #327506).
 
- -- David Nusinow <dnusinow@debian.org>  Tue, 27 Sep 2005 21:48:25 -0400
+ -- David Nusinow <dnusinow@debian.org>  Tue, 27 Sep 2005 22:16:30 -0400
 
 xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
 

Modified: trunk/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xserver-xorg.postinst.in	2005-09-28 01:56:15 UTC (rev 631)
+++ trunk/debian/xserver-xorg.postinst.in	2005-09-28 02:18:40 UTC (rev 632)
@@ -358,9 +358,11 @@
   PRIORITY=high
   if [ -z "$NOPROBE" ]; then
     NRES=0
-    for i in $RESOLUTIONS; do
-      NRES=$(expr $NRES + 1)
-    done
+    if [ -n $RESOLUTION ]; then
+      for i in $RESOLUTIONS; do
+        NRES=$(expr $NRES + 1)
+      done
+    fi
 
     if [ "$NRES" -gt "0" ]; then
       # got RESOLUTIONS. Lower question priority



Reply to: