setup.py: don't try to import stgit.run before the python version check

[stgit] / setup.py

diff --git a/setup.py b/setup.py
index 7b0ded5c72f666d7e51b3b30c6e991bc08b3a725..c1eb4bd726c3a0e52877d705023d606c3f36dbc6 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-import sys, glob
+import sys, glob, os

 from distutils.core import setup
 
 from stgit.version import version, git_min_ver, python_min_ver
 from distutils.core import setup
 
 from stgit.version import version, git_min_ver, python_min_ver

-from stgit.run import Run

 
 def __version_to_list(version):
     """Convert a version string to a list of numbers or strings
 
 def __version_to_list(version):
     """Convert a version string to a list of numbers or strings


@@ -37,6 +36,7 @@ def __check_python_version():
 def __check_git_version():
     """Check the minimum GIT version
     """
 def __check_git_version():
     """Check the minimum GIT version
     """

+    from stgit.run import Run

     gitver = Run('git', '--version').output_one_line().split()[2]
     if not __check_min_version(git_min_ver, gitver):
         print >> sys.stderr, 'GIT version %s or newer required. Found %s' \
     gitver = Run('git', '--version').output_one_line().split()[2]
     if not __check_min_version(git_min_ver, gitver):
         print >> sys.stderr, 'GIT version %s or newer required. Found %s' \


@@ -48,6 +48,9 @@ if sys.argv[1] in ['install', 'build']:
     __check_python_version()
     __check_git_version()
 
     __check_python_version()
     __check_git_version()
 

+# ensure readable template files
+old_mask = os.umask(0022)
+

 setup(name = 'stgit',
       version = version,
       license = 'GPLv2',
 setup(name = 'stgit',
       version = version,
       license = 'GPLv2',


@@ -66,3 +69,6 @@ setup(name = 'stgit',
                                              'contrib/stgit-completion.bash']),
                     ('share/doc/stgit', glob.glob('doc/*.txt'))]
       )
                                              'contrib/stgit-completion.bash']),
                     ('share/doc/stgit', glob.glob('doc/*.txt'))]
       )

+
+# restore the old mask
+os.umask(old_mask)