diff options
| -rw-r--r-- | git/index/base.py | 2 | ||||
| -rw-r--r-- | git/util.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/git/index/base.py b/git/index/base.py index d813e6c1..88410e20 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -630,7 +630,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): Function with signature (string) func(BaseIndexEntry) function returning a path for each passed entry which is the path to be actually recorded for the object created from entry.path. This allows you to write an index which - is not identical to the layout of the actual files on your hard-dist. + is not identical to the layout of the actual files on your hard-disk. If not None and ``items`` contain plain paths, these paths will be converted to Entries beforehand and passed to the path_rewriter. Please note that entry.path is relative to the git repository. diff --git a/git/util.py b/git/util.py index f81e3741..cbb6a66c 100644 --- a/git/util.py +++ b/git/util.py @@ -8,8 +8,8 @@ import os import re import sys import time -import platform import tempfile +import platform from gitdb.util import ( make_sha, @@ -90,7 +90,6 @@ def assure_directory_exists(path, is_file=False): return True return False - def get_user_id(): """:return: string identifying the currently active system user as name@node :note: user can be set with the 'USER' environment variable, usually set on windows""" @@ -106,7 +105,7 @@ def sleep_on_gui_present_osx_crashfix(): #HACK: These two lines are necessary because OSX raises an error if you try to .wait() right after creating the process object. # It is only necessary when using GUI frameworks to instantiate an application. - if platform.system().startswith("Darwin") and "PySide" in sys.modules.keys(): + if sys.platform == "darwin" and "PySide" in sys.modules.keys(): time.sleep(0.1) #} END utilities |