From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 28 Apr 2015 19:06:19 +0000 (+0200)
Subject: ddns: Add more upstream patches.
X-Git-Tag: v2.17-core91~91^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bcd81934d900845fa178bf11d138c95715f11c9;p=ipfire-2.x.git

ddns: Add more upstream patches.
---

diff --git a/lfs/ddns b/lfs/ddns
index 93f6667e65..463ae28a9d 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -71,7 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns/ddns-007-perform-lazy-database-init.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns/001-ddns-007-perform-lazy-database-init.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns/002-ddns-007-also-open-database-for-search-operations.patch
 
 	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure \
diff --git a/src/patches/ddns/ddns-007-perform-lazy-database-init.patch b/src/patches/ddns/001-ddns-007-perform-lazy-database-init.patch
similarity index 100%
rename from src/patches/ddns/ddns-007-perform-lazy-database-init.patch
rename to src/patches/ddns/001-ddns-007-perform-lazy-database-init.patch
diff --git a/src/patches/ddns/002-ddns-007-also-open-database-for-search-operations.patch b/src/patches/ddns/002-ddns-007-also-open-database-for-search-operations.patch
new file mode 100644
index 0000000000..19534f3b81
--- /dev/null
+++ b/src/patches/ddns/002-ddns-007-also-open-database-for-search-operations.patch
@@ -0,0 +1,40 @@
+commit f62fa5baffe2d225604460ecd03b8159b987df8f
+Author: Michael Tremer <michael.tremer@ipfire.org>
+Date:   Sun Apr 26 20:15:33 2015 +0200
+
+    database: Open database for the search operations, too
+
+diff --git a/src/ddns/database.py b/src/ddns/database.py
+index 42c3433..70a7363 100644
+--- a/src/ddns/database.py
++++ b/src/ddns/database.py
+@@ -122,6 +122,9 @@ class DDNSDatabase(object):
+ 		"""
+ 			Returns the timestamp of the last update (with the given status code).
+ 		"""
++		if self._db is None:
++			self._db = self._open_database(self.path)
++
+ 		c = self._db.cursor()
+ 
+ 		try:
+@@ -141,6 +144,9 @@ class DDNSDatabase(object):
+ 		"""
+ 			Returns the update status of the last update.
+ 		"""
++		if self._db is None:
++			self._db = self._open_database(self.path)
++
+ 		c = self._db.cursor()
+ 
+ 		try:
+@@ -156,6 +162,9 @@ class DDNSDatabase(object):
+ 		"""
+ 			Returns the reason string for the last failed update (if any).
+ 		"""
++		if self._db is None:
++			self._db = self._open_database(self.path)
++
+ 		c = self._db.cursor()
+ 
+ 		try: