[Python-apps-commits] r12425 - in packages/gitinspector/trunk/debian/patches (4 files)
ckk at users.alioth.debian.org
ckk at users.alioth.debian.org
Wed Sep 30 15:40:26 UTC 2015
Date: Wednesday, September 30, 2015 @ 15:40:25
Author: ckk
Revision: 12425
d/patches: Drop patches included upstream
Modified:
packages/gitinspector/trunk/debian/patches/series
Deleted:
packages/gitinspector/trunk/debian/patches/Add-missing-HTML-footer-to-htmlembedded-output.patch
packages/gitinspector/trunk/debian/patches/Print-usage-when-called-without-any-args.patch
packages/gitinspector/trunk/debian/patches/fix-C-locale-crash.patch
Deleted: packages/gitinspector/trunk/debian/patches/Add-missing-HTML-footer-to-htmlembedded-output.patch
===================================================================
--- packages/gitinspector/trunk/debian/patches/Add-missing-HTML-footer-to-htmlembedded-output.patch 2015-09-30 15:38:21 UTC (rev 12424)
+++ packages/gitinspector/trunk/debian/patches/Add-missing-HTML-footer-to-htmlembedded-output.patch 2015-09-30 15:40:25 UTC (rev 12425)
@@ -1,30 +0,0 @@
-From: Christian Kastner <ckk at kvr.at>
-Date: Sat, 22 Nov 2014 20:46:55 +0100
-Subject: Add missing HTML footer to htmlembedded output
-
-Add the HTML footer missing in htmlembedded output mode by mirroring the code
-for the header.
-
-Bug: https://code.google.com/p/gitinspector/issues/detail?id=48
-Applied-Upstream: https://code.google.com/p/gitinspector/source/detail?r=3010359eb2fd
-Last-Update: 2014-11-22
----
- gitinspector/format.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: gitinspector-0.3.2/gitinspector/format.py
-===================================================================
---- gitinspector-0.3.2.orig/gitinspector/format.py
-+++ gitinspector-0.3.2/gitinspector/format.py
-@@ -97,8 +97,9 @@ def output_header():
- print("\t<version>" + version.__version__ + "</version>")
-
- def output_footer():
-- if __selected_format__ == "html":
-- html_footer = __output_html_template__("html/html.footer")
-+ if __selected_format__ == "html" or __selected_format__ == "htmlembedded":
-+ base = basedir.get_basedir()
-+ html_footer = __output_html_template__(base + "/html/html.footer")
- print(html_footer)
- elif __selected_format__ == "xml":
- print("</gitinspector>")
Deleted: packages/gitinspector/trunk/debian/patches/Print-usage-when-called-without-any-args.patch
===================================================================
--- packages/gitinspector/trunk/debian/patches/Print-usage-when-called-without-any-args.patch 2015-09-30 15:38:21 UTC (rev 12424)
+++ packages/gitinspector/trunk/debian/patches/Print-usage-when-called-without-any-args.patch 2015-09-30 15:40:25 UTC (rev 12425)
@@ -1,34 +0,0 @@
-From: Christian Kastner <ckk at kvr.at>
-Date: Sat, 22 Nov 2014 20:28:21 +0100
-Subject: Print usage when called without any args
-
-When gitinspector is called with a path that is not a git repo, it prints a
-stack trace. This patch prints an error message instead.
-
-Bug: https://code.google.com/p/gitinspector/issues/detail?id=44
-Applied-Upstream: https://code.google.com/p/gitinspector/source/detail?r=e3b4857eb645
-Last-Update: 2014-11-22
----
- gitinspector/gitinspector.py | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/gitinspector/gitinspector.py b/gitinspector/gitinspector.py
-index 51f0836..cf4b43d 100755
---- a/gitinspector/gitinspector.py
-+++ b/gitinspector/gitinspector.py
-@@ -66,9 +66,12 @@ class Runner:
- previous_directory = os.getcwd()
-
- os.chdir(self.repo)
-- isbare = subprocess.Popen("git rev-parse --is-bare-repository", shell=True, bufsize=1,
-- stdout=subprocess.PIPE).stdout
-- isbare = isbare.readlines()
-+ sp = subprocess.Popen("git rev-parse --is-bare-repository", shell=True, bufsize=1,
-+ stdout=subprocess.PIPE, stderr=open(os.devnull, "w"))
-+ isbare = sp.stdout.readlines()
-+ sp.wait()
-+ if sp.returncode != 0:
-+ sys.exit("Error processing git repository at \"%s\"" % self.repo)
- self.isbare = (isbare[0].decode("utf-8", "replace").strip() == "true")
- absolute_path = ""
-
Deleted: packages/gitinspector/trunk/debian/patches/fix-C-locale-crash.patch
===================================================================
--- packages/gitinspector/trunk/debian/patches/fix-C-locale-crash.patch 2015-09-30 15:38:21 UTC (rev 12424)
+++ packages/gitinspector/trunk/debian/patches/fix-C-locale-crash.patch 2015-09-30 15:40:25 UTC (rev 12425)
@@ -1,33 +0,0 @@
-Author: Adam Waldenberg <adam.waldenberg at ejwa.se>
-Date: Mon Nov 24 09:36:11 2014 +0100
-
-Doesn't start when using "C" locale (Fixes issue 29).
-
-Bug: https://code.google.com/p/gitinspector/issues/detail?id=29
-Bug-Debian: https://bugs.debian.org/773143
-Origin: https://code.google.com/p/gitinspector/source/detail?r=8755fb33dcb1
-Last-Update: 2014-12-19
-
-Index: gitinspector-0.3.2+dfsg/gitinspector/localization.py
-===================================================================
---- gitinspector-0.3.2+dfsg.orig/gitinspector/localization.py
-+++ gitinspector-0.3.2+dfsg/gitinspector/localization.py
-@@ -47,11 +47,14 @@ def init():
- lang = locale.getdefaultlocale()
- os.environ['LANG'] = lang[0]
-
-- filename = "/usr/share/gitinspector/translations/messages_%s.mo" % lang[0][0:2]
-+ if lang[0] is not None:
-+ filename = basedir.get_basedir() + "/translations/messages_%s.mo" % lang[0][0:2]
-
-- try:
-- __translation__ = gettext.GNUTranslations(open(filename, "rb"))
-- except IOError:
-+ try:
-+ __translation__ = gettext.GNUTranslations(open(filename, "rb"))
-+ except IOError:
-+ __translation__ = gettext.NullTranslations()
-+ else:
- __translation__ = gettext.NullTranslations()
-
- __installed__ = True
Modified: packages/gitinspector/trunk/debian/patches/series
===================================================================
--- packages/gitinspector/trunk/debian/patches/series 2015-09-30 15:38:21 UTC (rev 12424)
+++ packages/gitinspector/trunk/debian/patches/series 2015-09-30 15:40:25 UTC (rev 12425)
@@ -1,5 +1,2 @@
-Print-usage-when-called-without-any-args.patch
-Add-missing-HTML-footer-to-htmlembedded-output.patch
Use-jQuery-libraries-from-the-Debian-archive.patch
Move-arch-indep-files-to-usr-share.patch
-fix-C-locale-crash.patch
More information about the Python-apps-commits
mailing list