matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No need to traverse up the directory to know if we are in a git repo, use the current branch instead of HEAD.

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-23 22:59:30 -04:00
parent 955f248efe
commit 63063b079f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/installation/models.py
View File

@@ -110,12 +110,12 @@ class Installation(SingletonModel):
namespace = PropertyNamespace('git', _('Git repository'))
try:
repo = Repo(os.path.abspath(os.path.join(settings.BASE_DIR, '..')))
repo = Repo(os.path.abspath(settings.BASE_DIR))
except:
namespace.add_property('is_git_repo', _('Running from a Git repository'), False)
else:
repo.config_reader()
headcommit = repo.head.commit
headcommit = repo.active_branch.commit
namespace.add_property('is_git_repo', _('Running from a Git repository'), True)
namespace.add_property('repo_remotes', _('Repository remotes'), ', '.join([unicode(remote) for remote in repo.remotes]), report=True)
namespace.add_property('repo_remotes_urls', _('Repository remotes URLs'), ', '.join([unicode(remote.url) for remote in repo.remotes]), report=True)
@@ -142,7 +142,7 @@ class Installation(SingletonModel):
self.os_properties()
self.binary_dependencies()
self.mayan_properties()
# self.git_properties()
self.git_properties()
self.virtualenv_properties()
def __getattr__(self, name):