summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2025-06-18 07:43:17 +0100
committerGitHub <noreply@github.com>2025-06-18 16:43:17 +1000
commitbc2ac8b53986b4af9b4e8874e4a589a4e8eca576 (patch)
treec54b5e015e7b284818b851cd565fd0d77d9c2f59
parent4707dd30d44867d9195689de6619d87fcc04c359 (diff)
downloadvyos.vyos-bc2ac8b53986b4af9b4e8874e4a589a4e8eca576.tar.gz
vyos.vyos-bc2ac8b53986b4af9b4e8874e4a589a4e8eca576.zip
Revert "T7320: Fixed compatibility with Paramiko by removing all "null" bytes." (#422)
* Revert "T7320: Fixed compatibility with Paramiko by removing all "null" bytes…" This reverts commit f02bc8b2af6de47962e3670e719d756df0cba029. * Changelog to enable the branch revert * Fixing lint --------- Co-authored-by: Om Nom <omnom62@outlook.com> Co-authored-by: Gaige B Paulsen <gaige@cluetrust.com>
-rw-r--r--changelogs/fragments/T7320-paramiko.yaml2
-rw-r--r--changelogs/fragments/revert-409-paramiko-compatible.yaml3
-rw-r--r--plugins/cliconf/vyos.py1
3 files changed, 3 insertions, 3 deletions
diff --git a/changelogs/fragments/T7320-paramiko.yaml b/changelogs/fragments/T7320-paramiko.yaml
deleted file mode 100644
index fd253b65..00000000
--- a/changelogs/fragments/T7320-paramiko.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
- - Fixed compatibility with paramiko.
diff --git a/changelogs/fragments/revert-409-paramiko-compatible.yaml b/changelogs/fragments/revert-409-paramiko-compatible.yaml
new file mode 100644
index 00000000..658c6166
--- /dev/null
+++ b/changelogs/fragments/revert-409-paramiko-compatible.yaml
@@ -0,0 +1,3 @@
+---
+trivial:
+ - changelog to enable the branch restore
diff --git a/plugins/cliconf/vyos.py b/plugins/cliconf/vyos.py
index 8cbafb1d..5beffaa1 100644
--- a/plugins/cliconf/vyos.py
+++ b/plugins/cliconf/vyos.py
@@ -138,7 +138,6 @@ class Cliconf(CliconfBase):
requests.append(cmd["command"])
out = self.get("compare")
out = to_text(out, errors="surrogate_or_strict")
- out = out.replace("\u0000", "")
diff_config = out if not out.startswith("No changes") else None
if diff_config: