← Back to branch summary

~jelmer/debian/sid/bzr/xs-testsuite-field-in-debian-control

« back to all changes in this revision

Viewing changes to debian/patches/04_autodoc_write

  • Committer: Jelmer Vernooij
  • Author(s): Dimitri John Ledkov, Jelmer Vernooij, Dimitri John Ledkov
  • Date: 2014-05-01 17:27:49 UTC
  • mfrom: (3815.3767.1)
  • Revision ID: jelmer@samba.org-20140501172749-qf303unfqa2q04bp
http://bugs.debian.org/722091
https://launchpad.net/bugs/1123460
[ Jelmer Vernooij ]
* Re-add myself to uploaders.
* Don't pass blob to file.writelines(), but rather to file.write().
  Closes: #722091

[ Dimitri John Ledkov ]
* New upstream snapshot:
  - verify-signature crashes on non ascii characters (LP: #1123460)
  - verify-signature crashes when acceptable_keys is defined (LP:
  #1249732)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_autodoc_write
 
1
Description: Write text to .write() rather than .writelines()
 
2
Author: Jelmer Vernooij <jelmer@debian.org>
 
3
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722091
 
4
Status: not (yet) forwarded upstream
 
5
 
 
6
=== modified file 'bzrlib/doc_generate/autodoc_rstx.py'
 
7
--- a/bzrlib/doc_generate/autodoc_rstx.py       2011-12-19 13:23:58 +0000
 
8
+++ b/bzrlib/doc_generate/autodoc_rstx.py       2014-04-27 21:54:41 +0000
 
9
@@ -131,7 +131,7 @@
 
10
     topic_id = "%s-%s" % (topic, "help")
 
11
     filename = bzrlib.osutils.pathjoin(output_dir, topic_id + ".txt")
 
12
     f =  open(filename, "w")
 
13
-    f.writelines(text)
 
14
+    f.write(text)
 
15
     f.close()
 
16
     return topic_id
 
17
 
 
18