Fix patch

diff --git a/debian/patches/0000-Revert-configure-Require-Python-3.9.patch b/debian/patches/0000-Revert-configure-Require-Python-3.9.patch
index 8c58c7a31bb9ee3f0c4e2dd9a31c035282c1e16a..88456cdf8f53c217f5084e8b3c7593026c0993e4 100644 (file)
--- a/debian/patches/0000-Revert-configure-Require-Python-3.9.patch
+++ b/debian/patches/0000-Revert-configure-Require-Python-3.9.patch
@@ -7,8 +7,8 @@ This reverts commit 643b8d062ac11efef6c74cf8af7281079e2533e9.
 Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 ---
  configure.ac         | 2 +-
- src/python/export.py | 7 ++++---
- 2 files changed, 5 insertions(+), 4 deletions(-)
+ src/python/export.py | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index e96e9ce..8b27cf6 100644
@@ -24,7 +24,7 @@ index e96e9ce..8b27cf6 100644
  
  # Perl
 diff --git a/src/python/export.py b/src/python/export.py
-index 3cdece4..13c0540 100644
+index 3cdece4..942700e 100644
 --- a/src/python/export.py
 +++ b/src/python/export.py
 @@ -17,7 +17,6 @@
@@ -55,3 +55,11 @@ index 3cdece4..13c0540 100644
                families = {
                        socket.AF_INET6 : "6",
                        socket.AF_INET  : "4",
+@@ -83,7 +84,6 @@ class OutputWriter(object):
+ 
+               return "%sv%s" % (self.name, families.get(self.family, "?"))
+ 
+-      @functools.cached_property
+       def filename(self):
+               if self.directory:
+                       return os.path.join(self.directory, "%s.%s" % (self.tag, self.suffix))

diff --git a/debian/patches/0001-Make-sources-around-that-we-can-run-tests-without-lo.patch b/debian/patches/0001-Make-sources-around-that-we-can-run-tests-without-lo.patch
index 4879c4c550e5357ab92ae4f09f8a38baa80669b9..170ccbdb0d3f9975a3705ca42a5e7eb8acc33178 100644 (file)
--- a/debian/patches/0001-Make-sources-around-that-we-can-run-tests-without-lo.patch
+++ b/debian/patches/0001-Make-sources-around-that-we-can-run-tests-without-lo.patch
@@ -14,7 +14,7 @@ Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
  src/python/__init__.py.in         |   26 -
  src/python/database.py            |  213 -----
  src/python/downloader.py          |  211 -----
- src/python/export.py              |  292 -------
+ src/python/export.py              |  291 -------
  src/python/i18n.py                |   26 -
  src/python/importer.py            |  250 ------
  src/python/location-importer.in   | 1535 -------------------------------------
@@ -22,14 +22,14 @@ Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
  src/python/location/__init__.py   |   24 +
  src/python/location/database.py   |  213 +++++
  src/python/location/downloader.py |  211 +++++
- src/python/location/export.py     |  292 +++++++
+ src/python/location/export.py     |  291 +++++++
  src/python/location/i18n.py       |   26 +
  src/python/location/importer.py   |  250 ++++++
  src/python/location/logger.py     |   46 ++
  src/python/logger.py              |   46 --
  src/scripts/location-importer.in  | 1535 +++++++++++++++++++++++++++++++++++++
  src/scripts/location.in           |  644 ++++++++++++++++
- 21 files changed, 3267 insertions(+), 3277 deletions(-)
+ 21 files changed, 3266 insertions(+), 3276 deletions(-)
  delete mode 100644 src/python/__init__.py.in
  delete mode 100644 src/python/database.py
  delete mode 100644 src/python/downloader.py
@@ -634,10 +634,10 @@ index 05f7872..0000000
 -              return True
 diff --git a/src/python/export.py b/src/python/export.py
 deleted file mode 100644
-index 13c0540..0000000
+index 942700e..0000000
 --- a/src/python/export.py
 +++ /dev/null
-@@ -1,292 +0,0 @@
+@@ -1,291 +0,0 @@
 -#!/usr/bin/python3
 -###############################################################################
 -#                                                                             #
@@ -724,7 +724,6 @@ index 13c0540..0000000
 -
 -              return "%sv%s" % (self.name, families.get(self.family, "?"))
 -
--      @functools.cached_property
 -      def filename(self):
 -              if self.directory:
 -                      return os.path.join(self.directory, "%s.%s" % (self.tag, self.suffix))
@@ -3877,10 +3876,10 @@ index 0000000..05f7872
 +              return True
 diff --git a/src/python/location/export.py b/src/python/location/export.py
 new file mode 100644
-index 0000000..13c0540
+index 0000000..942700e
 --- /dev/null
 +++ b/src/python/location/export.py
-@@ -0,0 +1,292 @@
+@@ -0,0 +1,291 @@
 +#!/usr/bin/python3
 +###############################################################################
 +#                                                                             #
@@ -3967,7 +3966,6 @@ index 0000000..13c0540
 +
 +              return "%sv%s" % (self.name, families.get(self.family, "?"))
 +
-+      @functools.cached_property
 +      def filename(self):
 +              if self.directory:
 +                      return os.path.join(self.directory, "%s.%s" % (self.tag, self.suffix))