'Environment not found' message when environment is wrong version

[Ryan J Ollos]

If environment has incorrect version, the browser message is:

Error

TracError: No Trac environment found at /Users/rjollos/Documents/Workspace/trac-dev/tracenvs/proj-1.0
Unknown Trac environment type 'Trac Environment Version 2'

I think we should reorder the exception handling so the message is:

Error

TracError: Unknown Trac environment type 'Trac Environment Version 2'

trac/env.py

@@ -401 +401 @@
         directory."""
         try:
             tag = read_file(os.path.join(self.path, 'VERSION')).splitlines()[0]
-            if tag != _VERSION:
-                raise Exception(_("Unknown Trac environment type '%(type)s'",
-                                  type=tag))
         except Exception, e:
             raise TracError(_("No Trac environment found at %(path)s\n"
                               "%(e)s", path=self.path, e=e))
+        if tag != _VERSION:
+            raise TracError(_("Unknown Trac environment type '%(type)s'",
+                              type=tag))
 
     def get_db_cnx(self):
         """Return a database connection from the connection pool

I'll add test coverage.

[Ryan J Ollos]

Proposed changes: [66d0b09b9/rjollos.git].

[Jun Omae]

When the VERSION file is empty, I get list index out of range. I couldn't understand the error.

Error

TracError: No Trac environment found at /dev/shm/tracenv-empty
list index out of range

I consider class name of the exception should be printed.

trac/env.py

@@ -403 +403 @@
             tag = read_file(os.path.join(self.path, 'VERSION')).splitlines()[0]
         except Exception, e:
             raise TracError(_("No Trac environment found at %(path)s\n"
-                              "%(e)s", path=self.path, e=e))
+                              "%(e)s",
+                              path=self.path, e=exception_to_unicode(e)))
         if tag != _VERSION:
             raise TracError(_("Unknown Trac environment type '%(type)s'",
                               type=tag))

The original IndexError would be fixed by the following patch:

-            tag = read_file(os.path.join(self.path, 'VERSION')).splitlines()[0]
+            with open(os.path.join(self.path, 'VERSION'), 'r') as f:
+                tag = f.readline().rstrip('\n')

[Jun Omae]

trac/tests/env.py has a syntax error with Python 2.5, at least.

  File "/dev/shm/66d0b09b9e7fb9a8df3d8d393bde461142348753/py25-sqlite/trac/tests/env.py", line 78
    except TracError as e:
                      ^
SyntaxError: invalid syntax

[Ryan J Ollos]

Minor issue so I'll fix only on 1.2-stable and higher.

[Ryan J Ollos]

Added comment:2 changes: log:rjollos.git:t13061_environment_wrong_version.1.

[Ryan J Ollos]

Committed to 1.2-stable in r16782, merged in r16783.

[Ryan J Ollos]

Regression reported in #13320.