← Back to branch summary

~ubuntu-branches/ubuntu/trusty/bzr-xmloutput/trusty

« back to all changes in this revision

Viewing changes to debian/patches/03_info_controldir

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2012-02-21 11:30:46 UTC
  • Revision ID: package-import@ubuntu.com-20120221113046-n854cxkvrn6upq61
Tags: 0.8.8+bzr160-2
http://bugs.debian.org/660728
* Add patches to improve compatibility with newer versions of bzr:
 + 01_no_inventory: Don't rely on inventories being available
 + 02_elementtree: Use correct location of elementtree. Closes: #660728
 + 03_info_controldir: Fix support for 'bzr xmlinfo' in empty control
   directories.
 + 04_no_revision_history: Avoid using deprecated `Branch.revision_history`
   call.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_info_controldir
 
1
Origin: commit, revision id: jelmer@samba.org-20120221101857-e77da9mh3ytjrh6f
 
2
Author: Jelmer Vernooij <jelmer@samba.org>
 
3
Description: Fix 'bzr xmlinfo' in empty control directories
 
4
Last-Update: 2012-02-21
 
5
Applied-Upstream: no
 
6
X-Bzr-Revision-Id: jelmer@samba.org-20120221101857-e77da9mh3ytjrh6f
 
7
 
 
8
=== modified file 'infoxml.py'
 
9
--- old/infoxml.py      2011-12-12 15:11:38 +0000
 
10
+++ new/infoxml.py      2012-02-21 10:18:57 +0000
 
11
@@ -102,7 +102,7 @@
 
12
         verbose = 1
 
13
     if verbose is True:
 
14
         verbose = 2
 
15
-    layout = info.describe_layout(repository, branch, working)
 
16
+    layout = info.describe_layout(repository, branch, working, control)
 
17
     formats = info.describe_format(control, repository,
 
18
                                    branch, working).split(' or ')
 
19
     outfile.write('<layout>%s</layout>' % layout)
 
20