[Python-modules-commits] [junos-eznc] 01/01: d/patches: patch to correctly detect format when using "insert"

[Vincent Bernat]

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

bernat pushed a commit to annotated tag debian/2.1.7-2
in repository junos-eznc.

commit fe3eb619c398f0bb44a0ef1503b3a435dac0d40d
Author: Vincent Bernat <vincent at bernat.im>
Date:   Mon Nov 20 15:39:08 2017 +0100

    d/patches: patch to correctly detect format when using "insert"
---
 debian/changelog                                    |  6 ++++++
 ...etect-format-set-when-using-insert-keyword.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c55cbae..92c5bae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+junos-eznc (2.1.7-2) unstable; urgency=medium
+
+  * d/patches: patch to correctly detect format when using "insert".
+
+ -- Vincent Bernat <bernat at debian.org>  Mon, 20 Nov 2017 15:39:04 +0100
+
 junos-eznc (2.1.7-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/patches/0002-Detect-format-set-when-using-insert-keyword.patch b/debian/patches/0002-Detect-format-set-when-using-insert-keyword.patch
new file mode 100644
index 0000000..95a3992
--- /dev/null
+++ b/debian/patches/0002-Detect-format-set-when-using-insert-keyword.patch
@@ -0,0 +1,21 @@
+From: Vincent Bernat <vincent at bernat.im>
+Date: Thu, 2 Nov 2017 21:57:17 +0100
+Subject: Detect format "set" when using "insert" keyword
+
+---
+ lib/jnpr/junos/utils/config.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/jnpr/junos/utils/config.py b/lib/jnpr/junos/utils/config.py
+index 2d7d197..55a89ca 100644
+--- a/lib/jnpr/junos/utils/config.py
++++ b/lib/jnpr/junos/utils/config.py
+@@ -435,7 +435,7 @@ class Config(Util):
+             """ setup the kvargs/rpc_xattrs using string regular expression """
+             if re.search(r'^\s*<.*>$', rpc, re.MULTILINE):
+                 kvargs['format'] = 'xml'
+-            elif re.search(r'^\s*(set|delete|replace|rename)\s', rpc):
++            elif re.search(r'^\s*(set|delete|replace|rename|insert)\s', rpc):
+                 kvargs['format'] = 'set'
+             elif re.search(r'^[a-z:]*\s*[\w-]+\s+\{', rpc, re.I) and \
+                     re.search(r'.*}\s*$', rpc):
diff --git a/debian/patches/series b/debian/patches/series
index 4c019b6..5af2bd1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Do-not-provide-the-key-if-it-comes-from-the-SSH-conf.patch
+0002-Detect-format-set-when-using-insert-keyword.patch

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