~ubuntu-branches/ubuntu/saucy/xxdiff/saucy

Viewing changes to debian/patches/08_516143_xml_is_text.dpatch

Committer: Bazaar Package Importer
Author(s): Y Giridhar Appaji Nag
Date: 2009-02-24 14:51:19 UTC
Revision ID: james.westby@ubuntu.com-20090224145119-gxqpvlgd96g2ru1i

Tags: 1:3.2-9

http://bugs.debian.org/516143

* Update Maintainer to official Debian ID
* Remove DM-Upload-Allowed: yes
* Patch 08_516143_xml_is_text to classify XML files as text, thanks to
"J.P. Delport" <jpdelport@csir.co.za> for the patch (Closes: #516143)

files added:
debian/patches/08_516143_xml_is_text.dpatch

files modified:
debian/changelog

debian/control

debian/patches/00list

Show diffs side-by-side

added added

removed removed

debian/patches/08_516143_xml_is_text.dpatch

#! /bin/sh /usr/share/dpatch/dpatch-run

## 08_516143_xml_is_text.dpatch by Y Giridhar Appaji Nag <appaji@debian.org>

## All lines beginning with `## DP:' are a description of the patch.

## DP: Don't classify XML files as non-text, thanks "J.P. Delport"

## DP: <jpdelport@csir.co.za> for the bug report #516143 and the patch.

@DPATCH@

diff -urNad xxdiff-3.2~/lib/python/xxdiff/utils.py xxdiff-3.2/lib/python/xxdiff/utils.py

--- xxdiff-3.2~/lib/python/xxdiff/utils.py 2008-09-30 18:03:57.000000000 +0530

+++ xxdiff-3.2/lib/python/xxdiff/utils.py 2009-02-24 14:48:08.000000000 +0530

@@ -59,6 +59,7 @@

# options were taken from Ian F. Darwin's file implementation.

guesscmd = ['file', '-b', '-L']

text_re = re.compile('\\btext\\b')

+xml_re = re.compile('\\bXML\\b')

empty_re = re.compile('^empty$')

def istextfile(fn):

@@ -75,7 +76,7 @@

if p.returncode != 0 or stderr or stdout.startswith('cannot open'):

raise RuntimeError("Error: Running 'file' on '%s'." % fn)

- return bool(text_re.search(stdout) or empty_re.match(stdout))

+ return bool(text_re.search(stdout) or xml_re.search(stdout) or empty_re.match(stdout))

#-------------------------------------------------------------------------------

Older »