diff options
| author | Carl Suster <carl@contraflo.ws> | 2017-01-09 11:58:20 +1100 |
|---|---|---|
| committer | Carl Suster <carl@contraflo.ws> | 2017-01-09 11:58:20 +1100 |
| commit | 13c940577c6fbf345bbd59ddb951e47bd5ca392c (patch) | |
| tree | b98abd04ec0dd1439e538525018b7da24621465f | |
| parent | 881ff2b7d064e82e84846288b5cb9b5ff32cc4ac (diff) | |
| parent | 0a5a3e9b44be1ec1a150c027a07754a53f039189 (diff) | |
merge patched into master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0001-set-message_id-properly-in-expat-parser.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | pynzb/expat_nzb.py | 2 |
4 files changed, 28 insertions, 3 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index f316a6e..b634411 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -124074ce42e5d83c71e028a8757afb392cc96548 -124074ce42e5d83c71e028a8757afb392cc96548 +0a5a3e9b44be1ec1a150c027a07754a53f039189 +0a5a3e9b44be1ec1a150c027a07754a53f039189 124074ce42e5d83c71e028a8757afb392cc96548 124074ce42e5d83c71e028a8757afb392cc96548 python-pynzb_0.1.0.orig.tar.gz diff --git a/debian/patches/0001-set-message_id-properly-in-expat-parser.patch b/debian/patches/0001-set-message_id-properly-in-expat-parser.patch new file mode 100644 index 0000000..2ed07ab --- /dev/null +++ b/debian/patches/0001-set-message_id-properly-in-expat-parser.patch @@ -0,0 +1,24 @@ +From 0a5a3e9b44be1ec1a150c027a07754a53f039189 Mon Sep 17 00:00:00 2001 +From: Carl Suster <carl@contraflo.ws> +Date: Mon, 9 Jan 2017 11:57:13 +1100 +Subject: set message_id properly in expat parser + +Upstream had a typo in the expat parser wrapper which called the +non-existent message_id() when set_message_id() was intended. +--- + pynzb/expat_nzb.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pynzb/expat_nzb.py b/pynzb/expat_nzb.py +index 5c1b096..313dee6 100644 +--- a/pynzb/expat_nzb.py ++++ b/pynzb/expat_nzb.py +@@ -22,7 +22,7 @@ class ExpatNZBParser(BaseNZBParser): + elif name == 'group': + self.current_file.add_group(self.current_data) + elif name == 'segment': +- self.current_segment.message_id(self.current_data) ++ self.current_segment.set_message_id(self.current_data) + self.current_file.add_segment(self.current_segment) + + def char_data(self, data): diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6e8e20b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-set-message_id-properly-in-expat-parser.patch diff --git a/pynzb/expat_nzb.py b/pynzb/expat_nzb.py index 5c1b096..313dee6 100644 --- a/pynzb/expat_nzb.py +++ b/pynzb/expat_nzb.py @@ -22,7 +22,7 @@ class ExpatNZBParser(BaseNZBParser): elif name == 'group': self.current_file.add_group(self.current_data) elif name == 'segment': - self.current_segment.message_id(self.current_data) + self.current_segment.set_message_id(self.current_data) self.current_file.add_segment(self.current_segment) def char_data(self, data): |