1
=== modified file 'cronscripts/publishing/cron.germinate'
2
--- cronscripts/publishing/cron.germinate	2010-03-02 09:58:34 +0000
3
+++ cronscripts/publishing/cron.germinate	2010-04-13 12:58:27 +0000
4
@@ -127,7 +127,7 @@
5
127
echo " done."
127
echo " done."
6
128
128
7
129
# now generate the Supported extra overrides
129
# now generate the Supported extra overrides
9
130
$MAINTAINCE_CHECK $suite > "$MISCROOT/more-extra.override.$suite.main.supported"
130
$MAINTAINCE_CHECK $suite > "$MISCROOT/more-extra.override.$suite.main.supported" 2> maintenance-check.stderr
10
131
if [ $? -eq 0 ]; then
131
if [ $? -eq 0 ]; then
11
132
    cat "$MISCROOT/more-extra.override.$suite.main.supported" >> "$MISCROOT/more-extra.override.$suite.main.new"
132
    cat "$MISCROOT/more-extra.override.$suite.main.supported" >> "$MISCROOT/more-extra.override.$suite.main.new"
12
133
fi
133
fi
13
134
134
14
=== modified file 'cronscripts/publishing/maintenance-check.py'
15
--- cronscripts/publishing/maintenance-check.py	2010-04-12 15:13:53 +0000
16
+++ cronscripts/publishing/maintenance-check.py	2010-04-13 12:58:27 +0000
17
@@ -6,9 +6,19 @@
18
6
#  https://code.edge.launchpad.net/~mvo/ubuntu-maintenance-check/python-port
6
#  https://code.edge.launchpad.net/~mvo/ubuntu-maintenance-check/python-port
19
7
# (where it will vanish once taken here)
7
# (where it will vanish once taken here)
20
8
8
21
9
# this warning filter is only needed on older versions of python-apt,
22
10
# once the machine runs lucid it can be removed
23
11
import warnings
24
12
warnings.filterwarnings("ignore","apt API not stable yet")
25
13
import apt
26
14
warnings.resetwarnings()
27
15
28
16
import apt_pkg
29
9
import logging
17
import logging
30
18
import os
31
10
import sys
19
import sys
32
11
import urllib2
20
import urllib2
33
21
import urlparse
34
12
22
35
13
from optparse import OptionParser
23
from optparse import OptionParser
36
14
24
37
@@ -59,24 +69,98 @@
38
59
# germinate output base directory
69
# germinate output base directory
39
60
BASE_URL = "http://people.canonical.com/~ubuntu-archive/germinate-output/"
70
BASE_URL = "http://people.canonical.com/~ubuntu-archive/germinate-output/"
40
61
71
41
72
# hints dir url, hints file is "$distro.hints" by default
42
73
# (e.g. lucid.hints)
43
74
HINTS_DIR_URL = "http://people.canonical.com/~ubuntu-archive/seeds/platform.%s/SUPPORTED_HINTS"
44
75
45
76
# we need the archive root to parse the Sources file to support
46
77
# by-source hints
47
78
ARCHIVE_ROOT = "http://archive.ubuntu.com/ubuntu"
48
79
49
62
# support timeframe tag used in the Packages file
80
# support timeframe tag used in the Packages file
50
63
SUPPORT_TAG = "Supported"
81
SUPPORT_TAG = "Supported"
51
64
82
59
65
83
def get_binaries_for_source_pkg(srcname):
60
66
def get_structure(name, version):
84
    """ Return all binary package names for the given source package name.
61
67
    """ 
85
62
68
    get structure file for named distro and distro version 
86
    :param srcname: The source package name.
63
69
    (e.g. kubuntu, lucid)
87
    :return: A list of binary package names.
64
70
    """
88
    """
65
71
    f = urllib2.urlopen("%s/%s.%s/structure" % (BASE_URL, name, version))
89
    pkgnames = set()
66
90
    recs = apt_pkg.GetPkgSrcRecords()
67
91
    while recs.Lookup(srcname):
68
92
        for binary in recs.Binaries:
69
93
            pkgnames.add(binary)
70
94
    return pkgnames
71
95
72
96
def expand_src_pkgname(pkgname):
73
97
    """ Expand a package name if it is prefixed with src.
74
98
75
99
    If the package name is prefixed with src it will be expanded
76
100
    to a list of binary package names. Otherwise the original
77
101
    package name will be returned.
78
102
    
79
103
    :param pkgname: The package name (that may include src:prefix).
80
104
    :return: A list of binary package names (the list may be one element long).
81
105
    """
82
106
    if not pkgname.startswith("src:"):
83
107
        return [pkgname]
84
108
    return get_binaries_for_source_pkg(pkgname.split("src:")[1])
85
109
86
110
def create_and_update_deb_src_source_list(distroseries):
87
111
    """ Create sources.list and update cache.
88
112
89
113
    This creates a sources.list file with deb-src entries for a given 
90
114
    distroseries and apt.Cache.update() to make sure the data is up-to-date.
91
115
    :param distro: The code name of the distribution series (e.g. lucid).
92
116
    :return: None
93
117
    :raises: IOError: When cache update fails.
94
118
    """
95
119
    # apt root dir
96
120
    rootdir="./aptroot.%s" % distroseries
97
121
    sources_list_dir = os.path.join(rootdir, "etc","apt")
98
122
    if not os.path.exists(sources_list_dir):
99
123
        os.makedirs(sources_list_dir)
100
124
    sources_list = open(os.path.join(sources_list_dir, "sources.list"),"w")
101
125
    for pocket in [
102
126
        "%s" % distroseries, 
103
127
        "%s-updates" % distroseries, 
104
128
        "%s-security" % distroseries]:
105
129
        sources_list.write(
106
130
            "deb-src %s %s main restricted\n" % (
107
131
                ARCHIVE_ROOT, pocket))
108
132
    sources_list.close()
109
133
    # create required dirs/files for apt.Cache(rootdir) to work on older
110
134
    # versions of python-apt. once lucid is used it can be removed
111
135
    for d in  ["var/lib/dpkg", 
112
136
               "var/cache/apt/archives/partial",
113
137
               "var/lib/apt/lists/partial"]:
114
138
        if not os.path.exists(os.path.join(rootdir,d)):
115
139
            os.makedirs(os.path.join(rootdir,d))
116
140
    if not os.path.exists(os.path.join(rootdir,"var/lib/dpkg/status")):
117
141
        open(os.path.join(rootdir,"var/lib/dpkg/status"),"w")
118
142
    # open cache with our just prepared rootdir
119
143
    cache = apt.Cache(rootdir=rootdir)
120
144
    cache.update(apt.progress.FetchProgress())
121
145
122
146
def get_structure(distroname, version):
123
147
    """ Get structure file conent for named distro and distro version.
124
148
    
125
149
    :param name: Name of the distribution (e.g. kubuntu, ubuntu, xubuntu).
126
150
    :param version: Code name of the distribution version (e.g. lucid).
127
151
    :return: List of strings with the structure file content
128
152
    """
129
153
    f = urllib2.urlopen("%s/%s.%s/structure" % (BASE_URL, distroname, version))
130
72
    structure = f.readlines()
154
    structure = f.readlines()
131
73
    f.close()
155
    f.close()
132
74
    return structure
156
    return structure
133
75
157
134
76
def expand_seeds(structure, seedname):
158
def expand_seeds(structure, seedname):
138
77
    """ 
159
    """ Expand seed by its dependencies using the strucure file.
139
78
    expand seed by its dependencies using the strucure file
160
140
79
    returns a set() for the seed dependencies (excluding the original seedname)
161
    :param structure: The content of the STRUCTURE file as string list.
141
162
    :param seedname: The name of the seed as string that needs to be expanded.
142
163
    :return: a set() for the seed dependencies (excluding the original seedname)
143
80
    """
164
    """
144
81
    seeds = []
165
    seeds = []
145
82
    for line in structure:
166
    for line in structure:
146
@@ -150,6 +234,8 @@
147
150
    parser.add_option("--source-packages", "", default=False,
234
    parser.add_option("--source-packages", "", default=False,
148
151
                      action="store_true", 
235
                      action="store_true", 
149
152
                      help="show as source pkgs")
236
                      help="show as source pkgs")
150
237
    parser.add_option("--hints-file", "", default=None,
151
238
                      help="use diffenrt use hints file location")
152
153
    (options, args) = parser.parse_args()
239
    (options, args) = parser.parse_args()
153
154
240
154
155
    # init
241
    # init
155
@@ -160,6 +246,17 @@
156
160
            sys.exit(1)
246
            sys.exit(1)
157
161
    else:
247
    else:
158
162
        distro = "lucid"
248
        distro = "lucid"
159
249
160
250
    # make sure our deb-src information is up-to-date
161
251
    create_and_update_deb_src_source_list(distro)
162
252
163
253
    if options.hints_file:
164
254
        hints_file = options.hints_file
165
255
        (schema, netloc, path, query, fragment) = urlparse.urlsplit(hints_file)
166
256
        if not schema:
167
257
            hints_file = "file:%s" % path
168
258
    else:
169
259
        hints_file = HINTS_DIR_URL % distro
170
163
        
260
        
171
164
    # go over the distros we need to check
261
    # go over the distros we need to check
172
165
    pkg_support_time = {}
262
    pkg_support_time = {}
173
@@ -175,20 +272,60 @@
174
175
        else:
272
        else:
175
176
            support_timeframe = SUPPORT_TIMEFRAME
273
            support_timeframe = SUPPORT_TIMEFRAME
176
177
        get_packages_support_time(structure, name, pkg_support_time, support_timeframe)
274
        get_packages_support_time(structure, name, pkg_support_time, support_timeframe)
177
275
178
276
    # now check the hints file that is used to overwrite 
179
277
    # the default seeds
180
278
    try:
181
279
        for line in urllib2.urlopen(hints_file):
182
280
            line = line.strip()
183
281
            if not line or line.startswith("#"):
184
282
                continue
185
283
            try:
186
284
                (raw_pkgname, support_time) = line.split()
187
285
                for pkgname in expand_src_pkgname(raw_pkgname):
188
286
                    if support_time == 'unsupported':
189
287
                        try:
190
288
                            del pkg_support_time[pkgname]
191
289
                            sys.stderr.write("hints-file: marking %s unsupported\n" % pkgname)
192
290
                        except KeyError:
193
291
                            pass
194
292
                    else:
195
293
                        if pkg_support_time.get(pkgname) != support_time:
196
294
                            sys.stderr.write(
197
295
                                "hints-file: changing %s from %s to %s\n" % (
198
296
                                    pkgname,  pkg_support_time.get(pkgname), 
199
297
                                    support_time))
200
298
                            pkg_support_time[pkgname] = support_time
201
299
            except:
202
300
                logging.exception("can not parse line '%s'" % line)
203
301
    except urllib2.HTTPError, e:
204
302
        if e.getcode() != 404:
205
303
            raise
206
304
        sys.stderr.write("hints-file: %s gave 404 error\n" % hints_file)
207
178
    
305
    
208
179
    # output suitable for the extra-override file
306
    # output suitable for the extra-override file
209
180
    for pkgname in sorted(pkg_support_time.keys()):
307
    for pkgname in sorted(pkg_support_time.keys()):
223
181
        # go over the supported arches, they are divided in 
308
        # special case, the hints file may contain overrides that
224
182
        # first-class (PRIMARY) and second-class with different
309
        # are arch-specific (like zsh-doc/armel)
225
183
        # support levels
310
        if "/" in pkgname:
226
184
        for arch in SUPPORTED_ARCHES:
311
            print "%s %s %s" % (
227
185
            # full LTS support
312
                pkgname, SUPPORT_TAG, pkg_support_time[pkgname])
228
186
            if arch in PRIMARY_ARCHES:
313
        else:
229
187
                print "%s/%s %s %s" % (
314
            # go over the supported arches, they are divided in 
230
188
                    pkgname, arch, SUPPORT_TAG, pkg_support_time[pkgname])
315
            # first-class (PRIMARY) and second-class with different
231
189
            else:
316
            # support levels
232
190
                # not a LTS supported architecture, gets only regular
317
            for arch in SUPPORTED_ARCHES:
233
191
                # support_timeframe
318
                # ensure we do not overwrite arch-specific overwrites
234
192
                print "%s/%s %s %s" % (
319
                pkgname_and_arch = "%s/%s" % (pkgname, arch)
235
193
                    pkgname, arch, SUPPORT_TAG, SUPPORT_TIMEFRAME[0][0])
320
                if pkgname_and_arch in pkg_support_time:
236
321
                    break
237
322
                if arch in PRIMARY_ARCHES:
238
323
                    # arch with full LTS support
239
324
                    print "%s %s %s" % (
240
325
                        pkgname_and_arch, SUPPORT_TAG, pkg_support_time[pkgname])
241
326
                else:
242
327
                    # not a LTS supported architecture, gets only regular
243
328
                    # support_timeframe
244
329
                    print "%s %s %s" % (
245
330
                        pkgname_and_arch, SUPPORT_TAG, SUPPORT_TIMEFRAME[0][0])
246
194
                
331
Reviewer	Review Type	Date Requested	Status
Michael Nelson (community)	code	2010-03-25	Approve on 2010-04-14
Michael Vogt (community)			Needs Resubmitting on 2010-04-13
William Grant	code	2010-04-01	Approve on 2010-04-01
Review via email: mp+22118@code.launchpad.net