[firmware-nonfree] 01/01: debian/bin/gencontrol.py: Copy copyright files as binary, not default-encoded text
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Thu Jun 15 10:19:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch stretch
in repository firmware-nonfree.
commit 7a277f34d46226e0919571b098e3f113ecaa8764
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Thu Jun 15 03:25:17 2017 +0100
debian/bin/gencontrol.py: Copy copyright files as binary, not default-encoded text
Python 3.4 in jessie has a default text encoding of ASCII and blows up
when trying to copy UTF-8 files this way. Since we just copy these
files verbatim, use binary mode rather than bothering with text codecs.
(cherry picked from commit 1c32c91c97b761f02866d426b7e5b66da621d9be)
---
debian/bin/gencontrol.py | 4 ++--
debian/changelog | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 491bbe3..992de6a 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -200,8 +200,8 @@ class GenControl(debian_linux.gencontrol.Gencontrol):
package_dir = "debian/config/%s" % package
if os.path.exists('%s/copyright' % package_dir):
- f = open('%s/copyright' % package_dir)
- open("debian/firmware-%s.copyright" % package, 'w').write(f.read())
+ f = open('%s/copyright' % package_dir, 'rb')
+ open("debian/firmware-%s.copyright" % package, 'wb').write(f.read())
else:
vars['license'] = codecs.open("%s/LICENSE" % package_dir, 'r', 'utf-8').read()
codecs.open("debian/firmware-%s.copyright" % package, 'w', 'utf-8').write(self.substitute(copyright, vars))
diff --git a/debian/changelog b/debian/changelog
index 745d461..5664736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+firmware-nonfree (20161130-4) UNRELEASED; urgency=medium
+
+ * debian/bin/gencontrol.py: Copy copyright files as binary, not default-
+ encoded text
+
+ -- Ben Hutchings <ben at decadent.org.uk> Thu, 15 Jun 2017 03:27:21 +0100
+
firmware-nonfree (20161130-3) unstable; urgency=medium
* misc-nonfree: Include Intel OPA Gen1 firmware (Closes: #862458)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git
More information about the Kernel-svn-changes
mailing list