aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwking <wking@thialfi>2010-06-22 13:23:07 -0400
committerwking <wking@thialfi>2010-06-22 13:23:07 -0400
commit0b8658523a1ce8d9380540010335ab1b829342f7 (patch)
tree3ea7ebc25514dcaa84951499dd1dfa64bfd248af
parent1bb788dee94ab5e882c35f5c1bb95c1eecf69c16 (diff)
downloadbugseverywhere-0b8658523a1ce8d9380540010335ab1b829342f7.tar.gz
Darcs should look in ~/.darcs/author not ~/.darcs/prefs/author
From: http://darcs.net/manual/node7.html#env:DARCS_EMAIL
-rw-r--r--libbe/storage/vcs/darcs.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/libbe/storage/vcs/darcs.py b/libbe/storage/vcs/darcs.py
index f64a7f6..b0e5705 100644
--- a/libbe/storage/vcs/darcs.py
+++ b/libbe/storage/vcs/darcs.py
@@ -116,11 +116,11 @@ class Darcs(base.VCS):
if self.repo == None:
return None
for pref_file in ['author', 'email']:
- for darcs_dir in [os.path.join(self.repo, '_darcs'),
+ for prefs_dir in [os.path.join(self.repo, '_darcs', 'prefs'),
os.path.expanduser(os.path.join('~', '.darcs'))]:
- if darcs_dir == None:
+ if prefs_dir == None:
continue
- pref_path = os.path.join(darcs_dir, 'prefs', pref_file)
+ pref_path = os.path.join(prefs_dir, pref_file)
if os.path.exists(pref_path):
return self._vcs_get_file_contents(pref_path).strip()
for env_variable in ['DARCS_EMAIL', 'EMAIL']: