summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-03-26 20:14:06 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-03-26 20:16:32 +0000
commit4d563e9294529e6a47afe992cb7a8c900958afec (patch)
tree93bcbbfd78d8268d5c619657c1f42ea3a1867449
parentCompleting copyright file headers. (diff)
downloadgitlint-4d563e9294529e6a47afe992cb7a8c900958afec.tar.xz
gitlint-4d563e9294529e6a47afe992cb7a8c900958afec.zip
Moving debian specific patches to corresponding subdirectory.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/debian/0001-fix-test-with-python3.patch (renamed from debian/patches/0001-replace-readfp-with-Python2-read_file-function-to-fi.patch)19
-rw-r--r--debian/patches/series2
2 files changed, 7 insertions, 14 deletions
diff --git a/debian/patches/0001-replace-readfp-with-Python2-read_file-function-to-fi.patch b/debian/patches/debian/0001-fix-test-with-python3.patch
index dde4da9..4844467 100644
--- a/debian/patches/0001-replace-readfp-with-Python2-read_file-function-to-fi.patch
+++ b/debian/patches/debian/0001-fix-test-with-python3.patch
@@ -1,9 +1,6 @@
-Forwarded: https://github.com/jorisroovers/gitlint/pull/104
-From 84145c703a25acad5f2378535c642c5abc299fbe Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Thu, 26 Sep 2019 10:48:14 +0200
-Subject: [PATCH] replace readfp with Python2 read_file function, to fix a test
- failure:
+Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Description: replace readfp with Python2 read_file function, to fix a test failure:
+ https://github.com/jorisroovers/gitlint/pull/104
======================================================================
FAIL: test_config_file (test_cli.CLITests)
@@ -21,10 +18,9 @@ AssertionError: "/<<PKGBUILDDIR>>/git[197 chars]od\n" != ''
gitlint/config.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
-diff --git a/gitlint/config.py b/gitlint/config.py
-index fdc5e85..654523d 100644
---- a/gitlint/config.py
-+++ b/gitlint/config.py
+diff -Naurp gitlint.orig/gitlint/config.py gitlint/gitlint/config.py
+--- gitlint.orig/gitlint/config.py
++++ gitlint/gitlint/config.py
@@ -428,8 +428,7 @@ class LintConfigBuilder(object):
parser = ConfigParser()
@@ -35,6 +31,3 @@ index fdc5e85..654523d 100644
for section_name in parser.sections():
for option_name, option_value in parser.items(section_name):
---
-2.17.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 3fede26..65e35c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-replace-readfp-with-Python2-read_file-function-to-fi.patch
+debian/0001-fix-test-with-python3.patch