[Python-modules-commits] [mrtparse] 05/06: merge patched into master

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to branch master
in repository mrtparse.

commit bc18c17f50e6ede6a6b3fa0794a633acd448d8f8
Merge: 77bf200 339549b
Author: Vincent Bernat <bernat at debian.org>
Date:   Sun Jan 8 18:08:47 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Fix-BGP-attribute-initialization.patch    | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 mrtparse/__init__.py                               |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index c419e14,0000000..5025a42
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 60a7b2e8e45ce7ec42f893676692b0a86f562d98
- 60a7b2e8e45ce7ec42f893676692b0a86f562d98
++339549b71519ed136f1a3027e86e031c34f43d9b
++339549b71519ed136f1a3027e86e031c34f43d9b
 +60a7b2e8e45ce7ec42f893676692b0a86f562d98
 +60a7b2e8e45ce7ec42f893676692b0a86f562d98
 +mrtparse_1.5.orig.tar.gz
 +e6d3a0796da8bb564c15fca842b4d2e702b7192a
 +33753
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-BGP-attribute-initialization.patch
index 0000000,0000000..eb590ea
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-BGP-attribute-initialization.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 339549b71519ed136f1a3027e86e031c34f43d9b Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sun, 8 Jan 2017 18:07:46 +0100
++Subject: Fix BGP attribute initialization
++
++---
++ mrtparse/__init__.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/mrtparse/__init__.py b/mrtparse/__init__.py
++index 41c5efa7d3dc..1fff55f21747 100644
++--- a/mrtparse/__init__.py
+++++ b/mrtparse/__init__.py
++@@ -1189,7 +1189,7 @@ class BgpAttr(Base):
++         self.as4_aggr = None
++         self.aigp = None
++         self.attr_set = None
++-        self.larg_comm = None
+++        self.large_comm = None
++         self.val = None
++ 
++     def unpack(self, af=0):
diff --cc debian/patches/series
index 0000000,0000000..8763faf
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-BGP-attribute-initialization.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/mrtparse.git