summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/01-sphinx-config.patch11
-rw-r--r--debian/patches/01-tests.patch39
-rw-r--r--debian/patches/series2
3 files changed, 40 insertions, 12 deletions
diff --git a/debian/patches/01-sphinx-config.patch b/debian/patches/01-sphinx-config.patch
deleted file mode 100644
index e007a79..0000000
--- a/debian/patches/01-sphinx-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/docs/source/conf.py
-+++ b/docs/source/conf.py
-@@ -30,7 +30,7 @@
-
-
- # -- Options for HTML output ---------------------------------------------------
--html_theme = 'air'
-+#html_theme = 'air'
- #html_theme_options = {}
- html_theme_path = ['../../../sphinx-themes']
-
diff --git a/debian/patches/01-tests.patch b/debian/patches/01-tests.patch
new file mode 100644
index 0000000..404b138
--- /dev/null
+++ b/debian/patches/01-tests.patch
@@ -0,0 +1,39 @@
+From c874052721f1fc362f0363c11af33fe03a20d2f2 Mon Sep 17 00:00:00 2001
+From: Eugene Pankov <john.pankov@gmail.com>
+Date: Mon, 10 Feb 2014 13:42:52 +0300
+Subject: [PATCH] tests fix
+
+---
+ reconfigure/includers/auto.py | 2 +-
+ reconfigure/tests/configs/supervisor_tests.py | 1 +
+ reconfigure/tests/includers/nginx_tests.py | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/reconfigure/includers/auto.py b/reconfigure/includers/auto.py
+index c220d88..b5ba35a 100644
+--- a/reconfigure/includers/auto.py
++++ b/reconfigure/includers/auto.py
+@@ -52,7 +52,7 @@ def decompose_rec(self, node, result):
+ else:
+ if child.origin is None:
+ child.origin = node.origin
+- elif child.origin != node.origin:
++ if child.origin != node.origin:
+ node.children.remove(child)
+ result.setdefault(child.origin, RootNode()).children.append(self.decompose_rec(child, result))
+ else:
+diff --git a/reconfigure/tests/configs/supervisor_tests.py b/reconfigure/tests/configs/supervisor_tests.py
+index b304654..644f78a 100644
+--- a/reconfigure/tests/configs/supervisor_tests.py
++++ b/reconfigure/tests/configs/supervisor_tests.py
+@@ -16,6 +16,7 @@ class SupervisorConfigTest (BaseConfigTest):
+ result = {
+ "programs": [
+ {
++ "comment": None,
+ "autorestart": None,
+ "name": "test1",
+ "startsecs": None,
+--
+1.8.5.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 88f8645..2fbc70e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01-sphinx-config.patch
+01-tests.patch