Changeset 5026

Timestamp:

07/09/09 11:30:35 (4 years ago)

Author:

rcarvalho

Message:

Merged revisions 4382-4383 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r4382 | gpolo | 2009-03-19 19:36:46 -0300 (Qui, 19 Mar 2009) | 1 line

Be a bit safer when checking for sphinx version, currently it fails on N.NbN and similars.

........

r4383 | nopper | 2009-03-19 21:02:30 -0300 (Qui, 19 Mar 2009) | 1 line

Correcting typing error

........

Location:

branch/umitweb-ng

Files:

• . (modified) (1 prop)
• README (modified) (1 diff)
• setup.py (modified) (5 diffs)

branch/umitweb-ng/README

@@ -84 +84 @@
    If you want to define also a root to install umit in a chroot environment
    or if you are packing for you favorite distro, and you are a package
-   mantainer probably you should use the --root option in addition with
-   --pkgmantainer option ('-P' for the short form)
+   maintainer probably you should use the --root option in addition with
+   --pkgmaintainer option ('-P' for the short form)
 
    In a chroot environment assuming that you have mounted your root partition

branch/umitweb-ng/setup.py

@@ -162 +162 @@
 
         sphinx_ver = sphinx.__version__
-        if map(int, sphinx_ver.split('.')) < [0, 5, 1]:
+        def digits(x):
+            res = re.match('\d+', x)
+            if res is None:
+                return 0
+            else:
+                return int(res.group())
+        if map(digits, sphinx_ver.split('.')) < [0, 5, 1]:
             self.warn("Sphinx's version is too old (%s, expected at least "
                     "0.5.1, documentation won't be build." % sphinx_ver)
@@ -182 +188 @@
 class umit_install(install):
     user_options = install.user_options + \
-        [('pkgmantainer', 'P',
-          'Select this if you are a package mantainer' \
+        [('pkgmaintainer', 'P',
+          'Select this if you are a package maintainer' \
           ' and you are using --root option. This avoids' \
           ' wrong substitution in the program launcher' \
@@ -190 +196 @@
     def initialize_options(self):
         install.initialize_options(self)
-        self.pkgmantainer = 0
+        self.pkgmaintainer = 0
 
     def run(self):
@@ -260 +266 @@
                 break
 
-        if self.pkgmantainer and self.root:
+        if self.pkgmaintainer and self.root:
             modules = os.path.join('/', modules[len(self.root):])
 
@@ -315 +321 @@
                     result = result[0]
 
-                    if self.pkgmantainer and self.root:
+                    if self.pkgmaintainer and self.root:
                         result = os.path.join('/', result[len(self.root):])