# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1318710986 -7200
# Node ID 6813feee7e682ad21b255690b2580a109c5a6918
# Parent  f87f532b89cfbbdca70221b314d41161e5b59a98
Attempt to use both the distribution and installed Moin to identify the Moin version.

diff -r f87f532b89cf -r 6813feee7e68 moinsetup.py
--- a/moinsetup.py	Mon Oct 10 01:10:50 2011 +0200
+++ b/moinsetup.py	Sat Oct 15 22:36:26 2011 +0200
@@ -499,18 +499,19 @@
 
         "Return the MoinMoin version."
 
-        if self.moin_distribution:
-            this_dir = os.getcwd()
-            try:
-                chdir(self.moin_distribution)
-                version = self.get_moin_version_from_package_info() or \
-                    self.get_moin_version_from_import()
-                if version:
-                    return version
+        this_dir = os.getcwd()
 
-            finally:
-                chdir(this_dir)
+        for dir in [self.moin_distribution, self.prefix_site_packages]:
+            if dir:
+                try:
+                    chdir(dir)
+                    version = self.get_moin_version_from_package_info() or \
+                        self.get_moin_version_from_import()
+                    if version:
+                        return version
 
+                finally:
+                    chdir(this_dir)
         else:
             return self.get_moin_version_from_import()