aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorW. Trevor King <wking@drexel.edu>2010-05-19 07:17:36 -0400
committerW. Trevor King <wking@drexel.edu>2010-05-19 07:17:36 -0400
commita2a51929a848ffa6db92ec7218994461ecccb50a (patch)
tree63525a76f32eab87cc39ffd223859bd7fb3f5f3f
parentec043501dc30a8d4ba0b106ebfef51435c0d5f14 (diff)
downloadbugseverywhere-a2a51929a848ffa6db92ec7218994461ecccb50a.tar.gz
Fixed Eric Kow's _darcs/prefs/author bug.
-rw-r--r--.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/comments/1b21dabc-a90c-4687-bea0-7e9e69956e23/body3
-rw-r--r--.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/comments/1b21dabc-a90c-4687-bea0-7e9e69956e23/values11
-rw-r--r--.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/values2
-rw-r--r--libbe/storage/vcs/darcs.py2
4 files changed, 16 insertions, 2 deletions
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/comments/1b21dabc-a90c-4687-bea0-7e9e69956e23/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/comments/1b21dabc-a90c-4687-bea0-7e9e69956e23/body
new file mode 100644
index 0000000..7485ebd
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/comments/1b21dabc-a90c-4687-bea0-7e9e69956e23/body
@@ -0,0 +1,3 @@
+> libbe.mapfile.IllegalValue: Illegal value "Foo Bar <foo@example.com>\n"
+
+The trailing endline was the problem. Fixed now.
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/comments/1b21dabc-a90c-4687-bea0-7e9e69956e23/values b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/comments/1b21dabc-a90c-4687-bea0-7e9e69956e23/values
new file mode 100644
index 0000000..6275e96
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/comments/1b21dabc-a90c-4687-bea0-7e9e69956e23/values
@@ -0,0 +1,11 @@
+Author: W. Trevor King <wking@drexel.edu>
+
+
+Content-type: text/plain
+
+
+Date: Wed, 19 May 2010 11:16:23 +0000
+
+
+In-reply-to: 285006ba-16fc-4d09-86f1-893ff515e487
+
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/values b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/values
index 0638e78..de23989 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/values
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/5920ef40-ce56-44e0-9e2d-e9b888ab2880/values
@@ -7,7 +7,7 @@ reporter: Eric Kow <eric.kow@gmail.com>
severity: minor
-status: open
+status: fixed
summary: Fancy _darcs/prefs/author contents confuse be
diff --git a/libbe/storage/vcs/darcs.py b/libbe/storage/vcs/darcs.py
index b92977a..0f23278 100644
--- a/libbe/storage/vcs/darcs.py
+++ b/libbe/storage/vcs/darcs.py
@@ -120,7 +120,7 @@ class Darcs(base.VCS):
for pref_file in ['author', 'email']:
pref_path = os.path.join(darcs_dir, 'prefs', pref_file)
if os.path.exists(pref_path):
- return self._vcs_get_file_contents(pref_path)
+ return self._vcs_get_file_contents(pref_path).strip()
for env_variable in ['DARCS_EMAIL', 'EMAIL']:
if env_variable in os.environ:
return os.environ[env_variable]