diff options
| author |   Lance Albertson <ramereth@gentoo.org> | 2005-10-09 22:17:08 +0000 |
|---|---|---|
| committer | Lance Albertson <ramereth@gentoo.org> | 2005-10-09 22:17:08 +0000 |
| commit | 8b2429becabca22511e3996bb1a9bca239ee79c9 (patch) | |
| tree | d5f5c70ea01e1dba71a9622049b7d6161cdba298 /www-apps/viewcvs/files | |
| parent | Version bump for javadoc support using dev-java/gjdoc. (diff) | |
| download | historical-8b2429becabca22511e3996bb1a9bca239ee79c9.tar.gz historical-8b2429becabca22511e3996bb1a9bca239ee79c9.tar.bz2 historical-8b2429becabca22511e3996bb1a9bca239ee79c9.zip | |
new patch for commitid problems, changed around the names for config files to be example only
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'www-apps/viewcvs/files')
| -rw-r--r-- | www-apps/viewcvs/files/viewcvs-commitid-fix.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/www-apps/viewcvs/files/viewcvs-commitid-fix.patch b/www-apps/viewcvs/files/viewcvs-commitid-fix.patch new file mode 100644 index 000000000000..f04aa7ae9bdc --- /dev/null +++ b/www-apps/viewcvs/files/viewcvs-commitid-fix.patch @@ -0,0 +1,20 @@ +diff -u -r1.61 -r1.62 +--- viewcvs/viewcvs/lib/vclib/bincvs/__init__.py 2005/10/03 20:57:12 1.61 ++++ viewcvs/viewcvs/lib/vclib/bincvs/__init__.py 2005/10/05 12:51:50 1.62 +@@ -290,10 +290,16 @@ + '^retrieving revision (.*)$', + '^diff .*$', + ] ++ _re_diff_warning = re.compile( ++ r'^.*rcsdiff: .*,v: warning: Unknown phrases like .*\n$') + for i in range(len(headers)): + line = fp.readline() + if not line: + raise vclib.Error("Error reading diff headers") ++ # Eat up any warning lines ++ while re.match(_re_diff_warning, line): ++ line = fp.readline() ++ # Make sure we get five good lines of output that match what we expect + if not re.match(headers[i], string.lstrip(line)): + raise vclib.Error("Error parsing diff headers") + return fp |