1 | Description: <short summary of the patch> |
---|
2 | TODO: Put a short summary on the line above and replace this paragraph |
---|
3 | with a longer explanation of this change. Complete the meta-information |
---|
4 | with other relevant fields (see below for details). To make it easier, the |
---|
5 | information below has been extracted from the changelog. Adjust it or drop |
---|
6 | it. |
---|
7 | . |
---|
8 | germinate (2.25) unstable; urgency=medium |
---|
9 | . |
---|
10 | * Cope with malformed Built-Using fields, since we only started checking |
---|
11 | these recently and so older series have some errors. |
---|
12 | Author: Colin Watson <cjwatson@ubuntu.com> |
---|
13 | |
---|
14 | --- |
---|
15 | The information above should follow the Patch Tagging Guidelines, please |
---|
16 | checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here |
---|
17 | are templates for supplementary fields that you might want to add: |
---|
18 | |
---|
19 | Origin: <vendor|upstream|other>, <url of original patch> |
---|
20 | Bug: <url in upstream bugtracker> |
---|
21 | Bug-Debian: https://bugs.debian.org/<bugnumber> |
---|
22 | Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> |
---|
23 | Forwarded: <no|not-needed|url proving that it has been forwarded> |
---|
24 | Reviewed-By: <name and email of someone who approved the patch> |
---|
25 | Last-Update: <YYYY-MM-DD> |
---|
26 | |
---|
27 | --- germinate-2.25.orig/germinate/germinator.py |
---|
28 | +++ germinate-2.25/germinate/germinator.py |
---|
29 | @@ -833,8 +833,12 @@ class Germinator(object): |
---|
30 | if posarch and self._arch not in posarch: |
---|
31 | continue |
---|
32 | |
---|
33 | - pkg = pkg.split()[0] |
---|
34 | - |
---|
35 | + #pkg = pkg.split()[0] |
---|
36 | + try: |
---|
37 | + pkg = pkg.split()[0] |
---|
38 | + except Exception as e: |
---|
39 | + print(str(e)) |
---|
40 | + pass |
---|
41 | # a leading ! indicates a per-seed blacklist; never include this |
---|
42 | # package in the given seed or any of its inner seeds, no matter |
---|
43 | # what |
---|
44 | --- germinate-2.25.orig/germinate/scripts/germinate_update_metapackage.py |
---|
45 | +++ germinate-2.25/germinate/scripts/germinate_update_metapackage.py |
---|
46 | @@ -1,4 +1,4 @@ |
---|
47 | -# -*- coding: utf-8 -*- |
---|
48 | +# -*- coding: UTF-8 -*- |
---|
49 | |
---|
50 | # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Canonical Ltd. |
---|
51 | # Copyright (C) 2006 Gustavo Franco |
---|
52 | @@ -230,6 +230,7 @@ def main(argv): |
---|
53 | env['PATH'] = '/usr/sbin:/sbin:/usr/bin:/bin' |
---|
54 | debootstrap = subprocess.Popen( |
---|
55 | ['debootstrap', '--arch', arch, |
---|
56 | + '--no-check-gpg', |
---|
57 | '--components', ','.join(components), |
---|
58 | '--print-debs', dist, 'debootstrap-dir', archive_base[arch][0]], |
---|
59 | stdout=subprocess.PIPE, env=env, stderr=subprocess.PIPE, |
---|