[xiph-cvs] r6476 - trunk/positron/positron

[volsung at xiph.org]

Author: volsung
Date: 2004-03-30 18:18:01 -0500 (Tue, 30 Mar 2004)
New Revision: 6476

Modified:
   trunk/positron/positron/neuros.py
Log:
Revert case-insensitivity changes.  This is a way trickier issue than
it looks, and we're too close to release.  If your vfat driver is
operating in a case-sensitive mode, you are going to be way screwed.

<p>Modified: trunk/positron/positron/neuros.py
===================================================================
--- trunk/positron/positron/neuros.py	2004-03-30 23:16:18 UTC (rev 6475)
+++ trunk/positron/positron/neuros.py	2004-03-30 23:18:01 UTC (rev 6476)
@@ -20,7 +20,6 @@
 from os import path
 import util
 import ports
-import string
 
 class Error(Exception):
     """Base class for exceptions in this module."""
@@ -121,21 +120,11 @@
         self.mountpoint = path.abspath(mountpoint)
 
         # Check and see if the mountpoint looks legit
+        dbpath = path.join(self.mountpoint, Neuros.DB_DIR)
         try:
-            contents = os.listdir(self.mountpoint)
-            for name in contents:
-                if name.upper() == Neuros.DB_DIR.upper():
-                    # Make sure to save the proper case of the mountpoint
-                    Neuros.DB_DIR = name
-                    break
-            else:
-                raise Error("The mountpoint %s does not appear to contain"
-                            " a %s database directory."
-                            % (mountpoint, Neuros.DB_DIR))
-            
+            os.listdir(dbpath)
         except OSError:
-            raise Error("The mountpoint %s is not accessible."
-                        "  Please check your permissions."
+            raise Error("%s does not look like a Neuros mountpoint"
                         % (mountpoint,))
 
         # Handy to keep around

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.