Convert git_id() to the new id format

[stgit] / setup.py

diff --git a/setup.py b/setup.py
index 8d8f7a84041f3776e851e22a94b8597a70dfc318..81854d3573155549b96dfbbc7f3a00cb2d5847c3 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,6 @@ import sys, glob, os
 from distutils.core import setup
 
 from stgit import version
 from distutils.core import setup
 
 from stgit import version

-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


@@ -28,7 +27,7 @@ def __check_min_version(min_ver, ver):
 def __check_python_version():
     """Check the minimum Python version
     """
 def __check_python_version():
     """Check the minimum Python version
     """

-    pyver = '.'.join(str(n) for n in sys.version_info)
+    pyver = '.'.join(map(lambda x: str(x), sys.version_info))

     if not __check_min_version(version.python_min_ver, pyver):
         print >> sys.stderr, 'Python version %s or newer required. Found %s' \
               % (version.python_min_ver, pyver)
     if not __check_min_version(version.python_min_ver, pyver):
         print >> sys.stderr, 'Python version %s or newer required. Found %s' \
               % (version.python_min_ver, pyver)


@@ -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(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(version.git_min_ver, gitver):
         print >> sys.stderr, 'GIT version %s or newer required. Found %s' \


@@ -61,7 +61,7 @@ def __run_setup():
             ('share/stgit/contrib', ['contrib/diffcol.sh',
                                      'contrib/stgbashprompt.sh',
                                      'contrib/stgit-completion.bash']),
             ('share/stgit/contrib', ['contrib/diffcol.sh',
                                      'contrib/stgbashprompt.sh',
                                      'contrib/stgit-completion.bash']),

-            ('share/doc/stgit', glob.glob('doc/*.txt'))])
+            ])

 
 # Check the minimum versions required
 if sys.argv[1] in ['install', 'build']:
 
 # Check the minimum versions required
 if sys.argv[1] in ['install', 'build']: