Merge lp:~laney/ubuntu-archive-tools/update-output-helper into lp:ubuntu-archive-tools

[Iain Lane]

This is a script which constructs a view of the archive that more or less corresponds to one that britney is trying to create. You can use that to analyse why britney is saying that packages aren't able to migrate.

[lp:~laney/ubuntu-archive-tools/update-output-helper]

973. By Colin Watson on 2015-08-18

[r=cjwatson] Add the team looking after ippusbxd in main.

974. By Colin Watson on 2015-08-24

manage-chroot: Log in anonymously for get/info.

975. By Colin Watson on 2015-08-24

[r=cjwatson] sru-report: list kernel family packages in the -proposed cleanup section

976. By Colin Watson on 2015-08-31

[r=cjwatson] Add the pkg-ime team which is subscribed to a couple of packages in main.

[Iain Lane (laney)]

I should fix this to make it a wrapper (or something similar) before we merge - the interface is a bit weird currently.

[lp:~laney/ubuntu-archive-tools/update-output-helper]

977. By Martin Pitt on 2015-09-22

Add retry-autopkgtest-regressions

This generates a set of run-autopkgtest commands (from britney2-ubuntu branch)
to re-run all autopkgtests which regressed.

978. By Martin Pitt on 2015-10-09

sru-report: Update YAML parsing for autopkgtest regressions

979. By Colin Watson on 2015-10-20

copy-package: Fix same-destination check: identical archives compare unequal (thanks, launchpadlib), so compare archive references.

980. By Colin Watson on 2015-10-22

branch-livefses: Revert r956 and materialise the livefses collection up-front instead.

981. By Colin Watson on 2015-10-22

wily → xenial / vivid → wily

982. By Colin Watson on 2015-10-23

copy-package: Make success output less misleading.

983. By Colin Watson on 2015-12-08

Add s390x to various reports for xenial.

984. By Martin Pitt on 2015-12-15

retry-autopkgtest-regressions: Stop assuming number of info URLs in YAML excuses

985. By Colin Watson on 2016-01-06

copy-package: Pass source series/pocket to Archive.copyPackage.

986. By Martin Pitt on 2016-02-01

copy-package: Add sponsor option

987. By Steve Langasek on 2016-02-05

Merge lp:~brian-murray/ubuntu-archive-tools/link-to-autopkgtest-page

988. By Colin Watson on 2016-02-05

component-mismatches: remove unused code

989. By Colin Watson on 2016-02-05

bootstrap-package: new tool to bootstrap a single package using injected build-dependencies

990. By Steve Langasek on 2016-02-09

Merge lp:~brian-murray/ubuntu-archive-tools/unicode-traceback

991. By William Grant on 2016-02-09

manage-builders: Update column widths to better match modern data.

992. By William Grant on 2016-02-09

manage-builders: Increase Cleaning warning threshold from 5 to 10 minutes, as mass resets can be slow.

993. By William Grant on 2016-02-09

[r=wgrant] manage-builders: Add --set-vm-host option.

994. By Colin Watson on 2016-02-10

manage-builders: add --quiet option

995. By Martin Pitt on 2016-02-25

retry-autopkgtest-regressions: Add --all-proposed option when running under $ALL_PROPOSED

996. By Adam Conrad on 2016-02-28

copy-proposed-kernel: Use new kernel security PPA for --security

997. By Steve Langasek on 2016-02-29

Merge lp:~brian-murray/ubuntu-archive-tools/add-snappy-dev

998. By Colin Watson on 2016-03-03

manage-builders: add --set-virtual and --set-non-virtual options

999. By Colin Watson on 2016-03-03

bootstrap-package: allow bootstrapping builds that are still "Needs building"

1000. By Martin Pitt on 2016-03-04

retry-autopkgtest-regressions: Use argparse

1001. By Martin Pitt on 2016-03-04

retry-autopkgtest-regressions: Add --state option

This is useful to retry all RUNNING tests in case test queues got
flushed for maintenance.

1002. By Martin Pitt on 2016-03-04

retry-autopkgtest-regressions: Add --ci-train option

1003. By Martin Pitt on 2016-03-11

retry-autopkgtest-regressions: Add --max-age option

1004. By Martin Pitt on 2016-03-11

retry-autopkgtest-regressions: Add --min-age option

1005. By Steve Langasek on 2016-03-30

Merge lp:~brian-murray/ubuntu-archive-tools/mir-bug-creation-improvements

1006. By Steve Langasek on 2016-04-09

Explicitly spell out the bug statuses we look for when searching MIR bugs to include wontfix, so that previously-rejected MIRs are visible on the report.

1007. By Steve Langasek on 2016-04-09

Re-merge with trunk

1008. By Steve Langasek on 2016-04-12

Drop incomplete with/without response from bug status list, already encompassed by 'incomplete' - thanks, Brian\!

1009. By Adam Conrad on 2016-04-13

priority-mismatches: Remove s390-tools workarounds

1010. By Steve Langasek on 2016-04-14

Merge lp:~brian-murray/ubuntu-archive-tools/unsubbed-dev-release

1011. By Colin Watson on 2016-04-20

auto-sync, kernel-overrides, orphaned-sources: stop relying on {Packages,Sources}.bz2; use .gz for now because I'm lazy

1012. By Colin Watson on 2016-04-20

package-subscribers: remove unused import

1013. By Colin Watson on 2016-04-22

xenial → yakkety; wily → xenial

1014. By Steve Langasek on 2016-04-27

Recognize maas-maintainers as a main team subscriber

1015. By Martin Pitt on 2016-04-28

retry-autopkgtest-regressions: Fix crash on None age, add missing parenthesis

1016. By Steve Langasek on 2016-04-29

When opening bugs, use the right status - Incomplete (without response) - so that they'll be indexed on the package bug page; 'Incomplete' is a legacy status that shouldn't be used

1017. By Steve Langasek on 2016-05-03

Add ubuntu-openstack team to list of known main owners

1018. By Steve Langasek on 2016-05-11

Add 'cloudware' as an owning team for packages on the cloud images

1019. By Steve Langasek on 2016-05-11

remove cloudware again, this is a private team that we can't query

1020. By Steve Langasek on 2016-05-12

Add support for a -e option, to allow specifying the exact version of a
package to review in the queue (rather than forcing you to manually process
everything when more than one version is present).

1021. By Steve Langasek on 2016-05-12

Merge lp:~brian-murray/ubuntu-archive-tools/phasing-ignore-dpkg-errors

1022. By Steve Langasek on 2016-06-03

Merge lp:~brian-murray/ubuntu-archive-tools/sru-report-table-id

1023. By Iain Lane on 2016-06-03

merge

1024. By Iain Lane on 2016-06-03

xz

1025. By Iain Lane on 2019-03-05

merge lp:~vorlon/ubuntu-archive-tools/update-output-helper

1026. By Iain Lane on 2019-03-05

update-output-helper: Handle sources which produce binaries of a different version

These have "Source: sourcename (sourceversion)" in their stanza in the Packages
file.

bash was doing interesting things when trying to handle the arguments to
grep-dctrl as a string (it was insisting on tokenising the '(' in "source
(version)" into their own arguments, despite all my pleading), so force its
hand by using an array.

[Steve Langasek (vorlon)]

Superseded now by https://code.launchpad.net/~ubuntu-archive/ubuntu-archive-tools/+git/ubuntu-archive-tools/+merge/460549. Thanks very much for the inspiration, Laney!

review: Disapprove

Unmerged revisions

1026. By Iain Lane on 2019-03-05

update-output-helper: Handle sources which produce binaries of a different version

These have "Source: sourcename (sourceversion)" in their stanza in the Packages
file.

bash was doing interesting things when trying to handle the arguments to
grep-dctrl as a string (it was insisting on tokenising the '(' in "source
(version)" into their own arguments, despite all my pleading), so force its
hand by using an array.

1025. By Iain Lane on 2019-03-05

merge lp:~vorlon/ubuntu-archive-tools/update-output-helper

1024. By Iain Lane on 2016-06-03

xz

1023. By Iain Lane on 2016-06-03

merge

=== modified file 'architecture-mismatches'
--- architecture-mismatches	2017-03-18 07:19:41 +0000
+++ architecture-mismatches	2019-03-05 10:27:11 +0000
@@ -186,7 +186,11 @@
 
     suite = options.suite
     components = ["main", "restricted", "universe", "multiverse"]
+<<<<<<< TREE
     arches = ["amd64", "arm64", "armhf", "i386", "ppc64el", "s390x"]
+=======
+    arches = ["amd64", "arm64", "armhf", "i386", "powerpc", "ppc64el", "s390x"]
+>>>>>>> MERGE-SOURCE
 
     if options.output_file is not None:
         sys.stdout = open('%s.new' % options.output_file, 'w')

=== modified file 'auto-sync'
=== modified file 'bootstrap-package'
--- bootstrap-package	2017-09-29 12:48:41 +0000
+++ bootstrap-package	2019-03-05 10:27:11 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 #! /usr/bin/python
 
 # Copyright (C) 2016  Canonical Ltd.
@@ -91,3 +92,97 @@
 
 if __name__ == "__main__":
     main()
+=======
+#! /usr/bin/python
+
+# Copyright (C) 2016  Canonical Ltd.
+# Author: Colin Watson <[e-mail]>
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Bootstrap a package build using injected build-dependencies."""
+
+from __future__ import print_function
+import sys
+
+from optparse import (
+    OptionParser,
+    SUPPRESS_HELP,
+    )
+
+from launchpadlib.launchpad import Launchpad
+
+import lputils
+
+
+def bootstrap_package(options, package):
+    source = lputils.find_latest_published_source(options, package)
+    arch_tags = [a.architecture_tag for a in options.architectures]
+    for build in source.getBuilds():
+        if build.arch_tag in arch_tags:
+            if (build.buildstate != "Needs building" and
+                    not build.can_be_retried):
+                print("%s cannot be retried" % build.web_link, file=sys.stderr)
+            elif options.dry_run:
+                print("Would bootstrap %s" % build.web_link)
+            else:
+                print("Bootstrapping %s" % build.web_link)
+                build.external_dependencies = (
+                    "deb http://archive-team.internal/bootstrap/%s %s main" %
+                    (build.arch_tag, source.distro_series.name))
+                build.lp_save()
+                build.retry()
+
+
+def bootstrap_packages(options, packages):
+    for package in packages:
+        bootstrap_package(options, package)
+
+
+def main():
+    parser = OptionParser(
+        usage="usage: %prog [options] package [...]",
+        epilog=lputils.ARCHIVE_REFERENCE_DESCRIPTION)
+    parser.add_option(
+        "-l", "--launchpad", dest="launchpad_instance", default="production")
+    parser.add_option(
+        "-n", "--dry-run", default=False, action="store_true",
+        help="only show what would be done")
+    parser.add_option("-A", "--archive", help="bootstrap in ARCHIVE")
+    parser.add_option(
+        "-s", "--suite", metavar="SUITE", help="bootstrap in SUITE")
+    parser.add_option(
+        "-a", "--architecture", dest="architectures", action="append",
+        metavar="ARCHITECTURE",
+        help="architecture tag (may be given multiple times)")
+    parser.add_option(
+        "-d", "--distribution", default="ubuntu", help=SUPPRESS_HELP)
+    parser.add_option(
+        "-e", "--version",
+        metavar="VERSION", help="package version (default: current version)")
+
+    options, args = parser.parse_args()
+
+    options.launchpad = Launchpad.login_with(
+        "bootstrap-package", options.launchpad_instance, version="devel")
+    lputils.setup_location(options, default_pocket="Proposed")
+
+    if not args:
+        parser.error("You must specify some packages to bootstrap.")
+
+    bootstrap_packages(options, args)
+
+
+if __name__ == "__main__":
+    main()
+>>>>>>> MERGE-SOURCE

=== modified file 'branch-livefses'
--- branch-livefses	2018-05-02 13:30:38 +0000
+++ branch-livefses	2019-03-05 10:27:11 +0000
@@ -30,12 +30,20 @@
                 livefs.distro_series == options.source_series):
             print("Branching %s for %s ..." % (
                 livefs.web_link, options.dest_series.name))
+<<<<<<< TREE
             new_livefs = options.launchpad.livefses.new(
                 owner=owner, distro_series=options.dest_series,
                 name=livefs.name, metadata=livefs.metadata)
             new_livefs.require_virtualized = livefs.require_virtualized
             new_livefs.relative_build_score = livefs.relative_build_score
             new_livefs.lp_save()
+=======
+            new_livefs = options.launchpad.livefses.new(
+                owner=owner, distro_series=options.dest_series,
+                name=livefs.name, metadata=livefs.metadata)
+            new_livefs.require_virtualized = livefs.require_virtualized
+            new_livefs.lp_save()
+>>>>>>> MERGE-SOURCE
             print("  %s" % new_livefs.web_link)
 
 

=== modified file 'checkrdepends'
--- checkrdepends	2018-10-30 10:59:16 +0000
+++ checkrdepends	2019-03-05 10:27:11 +0000
@@ -28,7 +28,11 @@
 
 
 default_base = '/home/ubuntu-archive/mirror/ubuntu'
+<<<<<<< TREE
 default_suite = 'disco'
+=======
+default_suite = 'yakkety'
+>>>>>>> MERGE-SOURCE
 components = ('main', 'restricted', 'universe', 'multiverse')
 
 # Cut-down RE from deb822.PkgRelation.
@@ -59,10 +63,15 @@
         return ('armhf',)
     elif suite in ('trusty', 'vivid', 'wily'):
         return ('arm64', 'armhf', 'powerpc', 'ppc64el')
+<<<<<<< TREE
     elif suite in ('xenial', 'yakkety'):
         return ('arm64', 'armhf', 'powerpc', 'ppc64el', 's390x')
     else:
         return ('arm64', 'armhf', 'ppc64el', 's390x')
+=======
+    else:
+        return ('arm64', 'armhf', 'powerpc', 'ppc64el', 's390x')
+>>>>>>> MERGE-SOURCE
 
 
 def read_tag_file(path):

=== modified file 'component-mismatches'
--- component-mismatches	2018-03-09 04:11:21 +0000
+++ component-mismatches	2019-03-05 10:27:11 +0000
@@ -141,8 +141,13 @@
     for suite in options.suites:
         for component in components_with_di:
             for arch in [
+<<<<<<< TREE
                     "i386", "amd64", "armhf", "arm64", "ppc64el",
                     "s390x"]:
+=======
+                    "i386", "amd64", "powerpc", "armhf", "arm64", "ppc64el",
+                    "s390x"]:
+>>>>>>> MERGE-SOURCE
                 binaries_path = "%s/dists/%s/%s/binary-%s/Packages.gz" % (
                     options.archive_dir, suite, component, arch)
                 for section in apt_pkg.TagFile(decompress_open(binaries_path)):
@@ -183,8 +188,13 @@
         # ideally supported+build-depends too, but Launchpad's
         # cron.germinate doesn't save this
 
+<<<<<<< TREE
         for arch in ["i386", "amd64", "armhf", "arm64", "ppc64el",
                      "s390x"]:
+=======
+        for arch in ["i386", "amd64", "powerpc", "armhf", "arm64", "ppc64el",
+                     "s390x"]:
+>>>>>>> MERGE-SOURCE
             for seed in seeds:
                 filename = "%s/%s_%s_%s_%s" % (
                     options.germinate_path, seed, flavour, options.suite, arch)
@@ -405,10 +415,17 @@
                     fc = "white"
                     # Need to use &amp; otherwise the svg will have a syntax error
                     url = ("https://launchpad.net/ubuntu/+source/%s/+filebug?"
+<<<<<<< TREE
                            "field.title=%s&amp;field.status=Incomplete"
                            "&amp;field.tags=%s" %
                            (quote_plus(name), quote_plus("[MIR] %s" % name),
                             quote_plus(suite)))
+=======
+                           "field.title=%s&amp;field.status=Incomplete+(without+response)"
+                           "&amp;field.tags=%s" %
+                           (quote_plus(name), quote_plus("[MIR] %s" % name),
+                            quote_plus(suite)))
+>>>>>>> MERGE-SOURCE
                 fd.write(' fillcolor="%s"' % fc)
                 if url:
                     fd.write(' URL="%s"' % url)
@@ -811,8 +828,13 @@
     '''
     result = defaultdict(list)
     mir_team = options.launchpad.people['ubuntu-mir']
+<<<<<<< TREE
     bug_statuses = ("New", "Incomplete", "Won't Fix", "Confirmed", "Triaged",
                     "In Progress", "Fix Committed", "Fix Released")
+=======
+    bug_statuses = ("New", "Incomplete", "Won't Fix", "Confirmed", "Triaged",
+                    "In Progress", "Fix Committed")
+>>>>>>> MERGE-SOURCE
     for source in sources:
         tasks = options.distro.getSourcePackage(name=source).searchTasks(
             bug_subscriber=mir_team, status=bug_statuses)

=== modified file 'copy-package'
--- copy-package	2018-01-05 12:28:17 +0000
+++ copy-package	2019-03-05 10:27:11 +0000
@@ -66,10 +66,17 @@
                 print("\t%s" % binary.display_name)
                 num_copies += 1
 
+<<<<<<< TREE
         print("Candidate copy target: %s" % args.destination.archive)
         if args.sponsoree:
             print("Sponsored for: %s" % args.sponsoree)
         if args.dry_run:
+=======
+        print("Candidate copy target: %s" % options.destination.archive)
+        if options.sponsoree:
+            print("Sponsored for: %s" % options.sponsoree)
+        if options.dry_run:
+>>>>>>> MERGE-SOURCE
             print("Dry run; no packages copied.")
         else:
             if not args.confirm_all:
@@ -79,6 +86,7 @@
             try:
                 args.destination.archive.copyPackage(
                     source_name=package, version=source.source_package_version,
+<<<<<<< TREE
                     from_archive=args.archive,
                     from_series=args.series.name,
                     from_pocket=args.pocket,
@@ -89,6 +97,18 @@
                     auto_approve=args.auto_approve,
                     silent=args.silent,
                     sponsored=args.sponsoree)
+=======
+                    from_archive=options.archive,
+                    from_series=options.series.name,
+                    from_pocket=options.pocket,
+                    to_series=options.destination.series.name,
+                    to_pocket=options.destination.pocket,
+                    include_binaries=options.include_binaries,
+                    unembargo=options.unembargo,
+                    auto_approve=options.auto_approve,
+                    silent=options.silent,
+                    sponsored=options.sponsoree)
+>>>>>>> MERGE-SOURCE
 
                 print("%d %s requested." % (
                     num_copies, "copy" if num_copies == 1 else "copies"))
@@ -148,9 +168,16 @@
             "When a package cannot be copied, normally this script exits "
             "with a non-zero status.  With --skip-missing instead, the "
             "error is printed and copying continues"))
+<<<<<<< TREE
     parser.add_argument(
         "--sponsor", metavar="USERNAME", dest="sponsoree", default=None,
         help="Sponsor the sync for USERNAME (a Launchpad username).")
+=======
+    parser.add_option("--sponsor", metavar="USERNAME",
+                      dest="sponsoree", default=None,
+                      help="Sponsor the sync for USERNAME (a Launchpad "
+                           "username).")
+>>>>>>> MERGE-SOURCE
 
     # Deprecated in favour of --to and --from.
     parser.add_argument(
@@ -234,11 +261,20 @@
 
         # TODO some equivalent of canModifySuite check?
 
+<<<<<<< TREE
     if (not args.force_same_destination and
             args.distribution == args.destination.distribution and
             args.suite == args.destination.suite and
             args.pocket == args.destination.pocket and
             args.archive.reference == args.destination.archive.reference):
+=======
+    if (not options.force_same_destination and
+            options.distribution == options.destination.distribution and
+            options.suite == options.destination.suite and
+            options.pocket == options.destination.pocket and
+            options.archive.reference ==
+                options.destination.archive.reference):
+>>>>>>> MERGE-SOURCE
         parser.error("copy destination must differ from source")
 
     if args.sponsoree:
@@ -248,7 +284,17 @@
             parser.error(
                 "Person to sponsor for not found: %s" % args.sponsoree)
 
+<<<<<<< TREE
     if copy_packages(args):
+=======
+    if options.sponsoree:
+        try:
+            options.sponsoree = options.launchpad.people[options.sponsoree]
+        except KeyError:
+            parser.error("Person to sponsor for not found: %s" % options.sponsoree)
+
+    if copy_packages(options, args):
+>>>>>>> MERGE-SOURCE
         return 0
     else:
         return 1

=== modified file 'copy-proposed-kernel'
--- copy-proposed-kernel	2018-08-14 08:31:43 +0000
+++ copy-proposed-kernel	2019-03-05 10:27:11 +0000
@@ -28,6 +28,7 @@
 
 from launchpadlib.launchpad import Launchpad
 
+<<<<<<< TREE
 
 parser = argparse.ArgumentParser(description='Copy a proposed kernel to the apropriate archive pocket')
 parser.add_argument('--dry-run', action='store_true', help='Do everything but actually copy the package')
@@ -67,6 +68,20 @@
         security = True
 
 (release, pkg) = (args.series, args.source)
+=======
+args = sys.argv[1:]
+if args[0] == '--security':
+    args = args[1:]
+    ppa_name = '~canonical-kernel-security-team/ubuntu/ppa'
+    security = True
+else:
+    ppa_name = '~canonical-kernel-team/ubuntu/ppa'
+    security = False
+if len(args) != 2:
+    sys.stderr.write('Usage: %s [--security] <release> <sourcepackage>\n' % sys.argv[0])
+    sys.exit(1)
+(release, pkg) = args[0:]
+>>>>>>> MERGE-SOURCE
 
 launchpad = Launchpad.login_with(
     'ubuntu-archive-tools', 'production', version='devel')

=== modified file 'cron.NBS'
--- cron.NBS	2018-10-30 10:59:16 +0000
+++ cron.NBS	2019-03-05 10:27:11 +0000
@@ -20,7 +20,11 @@
 
 MIRROR=$HOME/mirror
 DISTRIBUTION="${DISTRIBUTION:-ubuntu}"
+<<<<<<< TREE
 RELEASE="${RELEASE:-disco}"
+=======
+RELEASE="${RELEASE:-yakkety}"
+>>>>>>> MERGE-SOURCE
 OUTDIR="${OUTDIR:-$HOME/public_html/NBS}"
 OUTFILE="${OUTFILE:-$HOME/public_html/nbs.html}"
 

=== modified file 'manage-builders'
--- manage-builders	2018-12-21 17:53:51 +0000
+++ manage-builders	2019-03-05 10:27:11 +0000
@@ -61,10 +61,17 @@
     "-l", "--lp-instance", dest="lp_instance", default="production",
     help="use the specified Launchpad instance (default: production)")
 
-parser.add_argument(
-    "-q", "--quiet", dest="quiet", action="store_true", default=None,
-    help="only display errors")
-parser.add_argument(
+<<<<<<< TREE
+parser.add_argument(
+    "-q", "--quiet", dest="quiet", action="store_true", default=None,
+    help="only display errors")
+parser.add_argument(
+=======
+parser.add_option(
+    "-q", "--quiet", dest="quiet", action="store_true", default=None,
+    help="only display errors")
+parser.add_option(
+>>>>>>> MERGE-SOURCE
     "-v", "--verbose", dest="verbose", action="store_true", default=None,
     help="display more detail")
 
@@ -116,6 +123,7 @@
 parser.add_argument(
     "--set-failnotes", dest="set_failnotes", default=None,
     help="set the builder's failnotes")
+<<<<<<< TREE
 virtual_group = parser.add_mutually_exclusive_group()
 virtual_group.add_argument(
     "--set-virtual", dest="set_virtual", action="store_true", default=None,
@@ -136,6 +144,31 @@
     help="set the builder's VM host")
 
 args = parser.parse_args()
+=======
+parser.add_option(
+    "--set-virtual", dest="set_virtual", action="store_true", default=None,
+    help="mark the builder as virtual")
+parser.add_option(
+    "--set-non-virtual", dest="set_non_virtual",
+    action="store_true", default=None,
+    help="mark the builder as non-virtual")
+parser.add_option(
+    "--set-vm-host", dest="set_vm_host", default=None,
+    help="set the builder's VM host")
+
+(options, args) = parser.parse_args()
+
+if args:
+    parser.error(
+        "manage-builders does not take positional arguments.  Did you mean to "
+        "use -b?")
+if options.manual and options.auto:
+    parser.error("--manual and --auto are mutually exclusive")
+if options.enable and options.disable:
+    parser.error("--enable and --disable are mutually exclusive")
+if options.set_virtual and options.set_non_virtual:
+    parser.error("--set-virtual and --set-non-virtual are mutually exclusive")
+>>>>>>> MERGE-SOURCE
 
 changes = {}
 if args.manual:
@@ -147,6 +180,7 @@
 if args.disable or args.reset:
     # In the --reset case, we'll re-enable it manually after applying this.
     changes['builderok'] = False
+<<<<<<< TREE
 if args.set_failnotes is not None:
     changes['failnotes'] = args.set_failnotes or None
 if args.set_virtual:
@@ -159,6 +193,16 @@
     changes['active'] = False
 if args.set_vm_host is not None:
     changes['vm_host'] = args.set_vm_host or None
+=======
+if options.set_failnotes is not None:
+    changes['failnotes'] = options.set_failnotes or None
+if options.set_virtual:
+    changes['virtualized'] = True
+if options.set_non_virtual:
+    changes['virtualized'] = False
+if options.set_vm_host is not None:
+    changes['vm_host'] = options.set_vm_host or None
+>>>>>>> MERGE-SOURCE
 
 lp = Launchpad.login_with(
     'manage-builders', args.lp_instance, version='devel')
@@ -240,7 +284,11 @@
 
 count_changed = count_unchanged = 0
 
+<<<<<<< TREE
 if changes and not args.quiet:
+=======
+if changes and not options.quiet:
+>>>>>>> MERGE-SOURCE
     print('Updating %d builders.' % len(candidates))
 
 if args.verbose:
@@ -251,7 +299,11 @@
     list(group) for _, group in groupby(candidates, clump_sort_key)]
 
 for clump in builder_clumps:
+<<<<<<< TREE
     if not changes and not args.quiet:
+=======
+    if not changes and not options.quiet:
+>>>>>>> MERGE-SOURCE
         if clump != builder_clumps[0]:
             print()
         exemplar = clump[0]
@@ -276,11 +328,22 @@
                 changed = True
         if changed:
             count_changed += 1
+<<<<<<< TREE
             if not args.quiet:
                 print('* %s' % candidate.name)
+=======
+            candidate.lp_save()
+            if not options.quiet:
+                print('* %s' % candidate.name)
+>>>>>>> MERGE-SOURCE
         elif changes:
+<<<<<<< TREE
             if not args.quiet:
                 print('  %s' % candidate.name)
+=======
+            if not options.quiet:
+                print('  %s' % candidate.name)
+>>>>>>> MERGE-SOURCE
             count_unchanged += 1
         else:
             duration = get_clean_status_duration(candidate)
@@ -291,7 +354,13 @@
                 else:
                     failnote = 'no failnotes'
                 status = 'DISABLED: %s' % failnote
+<<<<<<< TREE
             elif is_cleaning(candidate):
+=======
+            elif (candidate.current_build_link is None
+                  and candidate.clean_status in ('Dirty', 'Cleaning')
+                  and duration > timedelta(minutes=10)):
+>>>>>>> MERGE-SOURCE
                 # Idle builders that have been dirty or cleaning for more
                 # than ten minutes are a little suspicious.
                 status = '%s %s' % (
@@ -318,8 +387,16 @@
                         dirty_flag, 'M' if candidate.manual else ' ',
                         'X' if not candidate.builderok else ' ',
                         status))
+<<<<<<< TREE
             elif not args.quiet:
+=======
+            elif not options.quiet:
+>>>>>>> MERGE-SOURCE
                 print('  %-20s %s' % (candidate.name, status))
 
+<<<<<<< TREE
 if changes and not args.quiet:
+=======
+if changes and not options.quiet:
+>>>>>>> MERGE-SOURCE
     print("Changed: %d. Unchanged: %d." % (count_changed, count_unchanged))

=== modified file 'manage-chroot'
--- manage-chroot	2019-02-20 07:41:07 +0000
+++ manage-chroot	2019-03-05 10:27:11 +0000
@@ -160,6 +160,7 @@
         help="do not ask for confirmation")
     parser.add_argument(
         "-d", "--distribution", default="ubuntu",
+<<<<<<< TREE
         metavar="DISTRIBUTION", help="manage base images for DISTRIBUTION")
     parser.add_argument(
         "-s", "--suite", "--series", dest="suite", metavar="SUITE",
@@ -209,6 +210,41 @@
                         args.build_url, web_host))
 
     return commands[args.command](args)
+=======
+        metavar="DISTRIBUTION", help="manage chroots for DISTRIBUTION")
+    parser.add_option(
+        "-s", "--series", dest="suite", metavar="SERIES",
+        help="manage chroots for SERIES")
+    parser.add_option(
+        "-a", "--architecture", metavar="ARCHITECTURE",
+        help="manage chroots for ARCHITECTURE")
+    parser.add_option(
+        "-f", "--filepath", metavar="PATH", help="Chroot file path")
+    options, args = parser.parse_args()
+
+    if options.architecture is None:
+        parser.error("You must specify an architecture.")
+    if not args:
+        parser.error(
+            "You must specify a command (%s)." % ", ".join(sorted(commands)))
+    command = args[0]
+    if command not in commands:
+        parser.error(
+            "Unrecognised command: %s (valid: %s)" %
+            (command, ", ".join(sorted(commands))))
+    if command == "set" and options.filepath is None:
+        parser.error("The set command requires a chroot file path (-f).")
+
+    if command in ("get", "info"):
+        login_method = Launchpad.login_anonymously
+    else:
+        login_method = Launchpad.login_with
+    options.launchpad = login_method(
+        "manage-chroot", options.launchpad_instance, version="devel")
+    lputils.setup_location(options)
+
+    return commands[command](options)
+>>>>>>> MERGE-SOURCE
 
 
 if __name__ == '__main__':

=== modified file 'nbs-report'
--- nbs-report	2018-10-30 10:59:16 +0000
+++ nbs-report	2019-03-05 10:27:11 +0000
@@ -209,7 +209,11 @@
         usage="%prog <checkrdepends output directory>",
         description="Generate an HTML report of current NBS binary packages.")
     parser.add_option('-d', '--distribution', default='ubuntu')
+<<<<<<< TREE
     parser.add_option('-s', '--suite', default='disco')
+=======
+    parser.add_option('-s', '--suite', default='yakkety')
+>>>>>>> MERGE-SOURCE
     parser.add_option(
         '--csv-file', help='record CSV time series data in this file')
     options, args = parser.parse_args()

=== modified file 'package-subscribers'
--- package-subscribers	2018-12-10 22:55:06 +0000
+++ package-subscribers	2019-03-05 10:27:11 +0000
@@ -120,15 +120,29 @@
         'foundations-bugs',
         'kernel-packages',
         'kubuntu-bugs',
+<<<<<<< TREE
         'landscape',
         'maas-maintainers',
+=======
+        'lubuntu-packaging',
+        'maas-maintainers',
+>>>>>>> MERGE-SOURCE
         'mir-team',
         'pkg-ime',
         'snappy-dev',
         'translators-packages',
+<<<<<<< TREE
         'ubuntu-openstack',
         'ubuntu-printing',
         'ubuntu-security',
+=======
+        'ubuntu-apps-bugs',
+        'ubuntu-openstack',
+        'ubuntu-phonedations-bugs',
+        'ubuntu-printing',
+        'ubuntu-sdk-bugs',
+        'ubuntu-security-bugs',
+>>>>>>> MERGE-SOURCE
         'ubuntu-server',
         ]
 

=== modified file 'phased-updater'
--- phased-updater	2018-09-18 14:07:35 +0000
+++ phased-updater	2019-03-05 10:27:11 +0000
@@ -258,10 +258,18 @@
                              signer)
                 continue
             signer_email = get_primary_email(signer)
+<<<<<<< TREE
             signer_name = signer.name
             # use the changes file as a backup method for determining email addresses
             changes_file_url = spph.changesFileUrl()
             try:
+=======
+            if not signer_email:
+                signer_name = ''
+                # if we can't determine their email use the changes file
+                changes_file_url = spph.changesFileUrl()
+                # need to handle a 404 here
+>>>>>>> MERGE-SOURCE
                 changes_file = urlopen(changes_file_url)
                 for line in changes_file.readlines():
                     line = line.strip()
@@ -327,6 +335,7 @@
                 # add signer, problem, pkg, version to notifications csv file
                 with codecs.open(NOTIFICATIONS, 'a', encoding='utf-8') as notify_file:
                     for bucket in spph_buckets[rname][spph]['buckets']:
+<<<<<<< TREE
                         notify_file.write('%s, %s, %s, %s\n' % \
                                           (signer_name, bucket,
                                            pkg, version))
@@ -334,6 +343,11 @@
                             notify_file.write('%s, %s, %s, %s\n' % \
                                               (creator.name, bucket,
                                                pkg, version))
+=======
+                        notify_file.write('%s, %s, %s, %s\n' % \
+                                          (signer_name.encode('utf-8'),
+                                          bucket, pkg, version))
+>>>>>>> MERGE-SOURCE
             if 'rate' in spph_buckets[rname][spph]:
                 # see if they have been emailed about the increased rate
                 # for this package version before
@@ -367,10 +381,14 @@
                 # notifications csv
                 with codecs.open(NOTIFICATIONS, 'a', encoding='utf-8') as notify_file:
                     notify_file.write('%s, increased-rate, %s, %s\n' %
+<<<<<<< TREE
                                       (signer_name, pkg, version))
                     if creator_email:
                         notify_file.write('%s, increased-rate, %s, %s\n' %
                                           (creator.name, pkg, version))
+=======
+                                      (signer.name, pkg, version))
+>>>>>>> MERGE-SOURCE
 
 
 def new_buckets(archive, release, src_pkg, version):

=== modified file 'pocket-mismatches'
--- pocket-mismatches	2017-03-27 15:58:27 +0000
+++ pocket-mismatches	2019-03-05 10:27:11 +0000
@@ -182,7 +182,11 @@
             for series in launchpad.distributions["ubuntu"].series
             if series.status in ("Supported", "Current Stable Release")])
     components = ["main", "restricted", "universe", "multiverse"]
+<<<<<<< TREE
     arches = ["amd64", "arm64", "armhf", "i386", "ppc64el", "s390x"]
+=======
+    arches = ["amd64", "arm64", "armhf", "i386", "powerpc", "ppc64el", "s390x"]
+>>>>>>> MERGE-SOURCE
 
     if options.output_file is not None:
         sys.stdout = open('%s.new' % options.output_file, 'w')

=== modified file 'priority-mismatches'
--- priority-mismatches	2018-06-05 21:13:33 +0000
+++ priority-mismatches	2019-03-05 10:27:11 +0000
@@ -287,7 +287,12 @@
 
     changes = 0
     if options.architecture is None:
+<<<<<<< TREE
         for arch in ('amd64', 'arm64', 'armhf', 'i386', 'ppc64el', 's390x'):
+=======
+        for arch in ('amd64', 'arm64', 'armhf', 'i386', 'powerpc', 'ppc64el',
+                     's390x'):
+>>>>>>> MERGE-SOURCE
             print(arch)
             print('=' * len(arch))
             print()

=== modified file 'publish-image-set'
--- publish-image-set	2019-02-15 16:39:05 +0000
+++ publish-image-set	2019-03-05 10:27:11 +0000
@@ -54,8 +54,12 @@
     '(alternate|desktop|dvd|server(?: subiquity)?|mobile|base|active|wubi)(?: preinstalled)? '
     '(i386|amd64$|amd64\+mac|armel$|armel\+dove|armel\+omap$|armel\+omap4|'
     'armel\+ac100|armel\+mx5|armhf$|armhf\+omap$|armhf\+omap4|armhf\+ac100|'
+<<<<<<< TREE
     'armhf\+mx5|armhf\+nexus7|armhf\+raspi2|armhf\+raspi3|arm64$|arm64\+raspi3|'
     'powerpc|ppc64el|s390x)', re.I)
+=======
+    'armhf\+mx5|armhf\+nexus7|arm64|powerpc|ppc64el|s390x)', re.I)
+>>>>>>> MERGE-SOURCE
 
 # map an image type from the ISO tracker to a source directory for
 # publish-release

=== modified file 'queuediff'
--- queuediff	2018-10-30 10:59:16 +0000
+++ queuediff	2019-03-05 10:27:11 +0000
@@ -41,7 +41,11 @@
 from launchpadlib.launchpad import Launchpad
 
 
+<<<<<<< TREE
 default_release = 'cosmic'
+=======
+default_release = 'xenial'
+>>>>>>> MERGE-SOURCE
 
 lp = None
 

=== modified file 'retry-autopkgtest-regressions'
--- retry-autopkgtest-regressions	2018-10-30 10:59:16 +0000
+++ retry-autopkgtest-regressions	2019-03-05 10:27:11 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 #!/usr/bin/python3
 # Generate a list of autopkgtest request.cgi URLs to
 # re-run all autopkgtests which regressed
@@ -190,3 +191,131 @@
             params += extra_params
             url = request_url + '?' + urllib.parse.urlencode(params)
             print(url)
+=======
+#!/usr/bin/python3
+# Generate a set of run-autopkgtest commands (from britney2-ubuntu branch) to
+# re-run all autopkgtests which regressed
+# Run with ALL_PROPOSED=1 to generate run-autopkgtest commands with
+# --all-proposed, i. e. with disabling apt pinning to the trigger.
+
+# Copyright (C) 2015 Canonical Ltd.
+# Author: Martin Pitt <[e-mail]>
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+# USA
+
+import urllib.request
+import argparse
+import yaml
+
+default_series = 'yakkety'
+args = None
+
+
+def parse_args():
+    parser = argparse.ArgumentParser('Generate run-autopkgtest commands to re-run regressions')
+    parser.add_argument('-s', '--series', default=default_series,
+                        help='Ubuntu series (default: %(default)s)')
+    parser.add_argument('--ci-train', metavar='SILONAME',
+                        help='Run for CI train silo, e. g. "landing-012"')
+    parser.add_argument('--all-proposed', action='store_true',
+                        help='generate run-autopkgtest commands with '
+                        '--all-proposed, i. e. with disabling apt pinning')
+    parser.add_argument('--state', default='REGRESSION',
+                        help='generate commands for given test state (default: %(default)s)')
+    parser.add_argument('--max-age', type=float, metavar='DAYS',
+                        help='only consider candiates which are at most '
+                        'this number of days old (float allowed)')
+    parser.add_argument('--min-age', type=float, metavar='DAYS',
+                        help='only consider candiates which are at least '
+                        'this number of days old (float allowed)')
+    return parser.parse_args()
+
+
+def get_regressions(excuses_url, release, retry_state, min_age, max_age):
+    '''Return dictionary with regressions
+
+    Return dict: release → arch → pkg → [trigger, ...]
+    '''
+    # load YAML excuses
+    with urllib.request.urlopen(excuses_url) as f:
+        excuses = yaml.load(f)
+    regressions = {}
+    for excuse in excuses['sources']:
+        # excuses are sorted by ascending age
+        if min_age is not None and excuse['age'] is not None and excuse['age'] < min_age:
+            continue
+        if max_age is not None and excuse['age'] is not None and excuse['age'] > max_age:
+            break
+        for pkg, archinfo in excuse.get('tests', {}).get('autopkgtest', {}).items():
+            pkg = pkg.split()[0]  # strip off version
+            trigger = excuse['source'] + '/' + excuse['new-version']
+            for arch, state in archinfo.items():
+                if state[0] == retry_state:
+                    regressions.setdefault(release, {}).setdefault(
+                        arch, {}).setdefault(pkg, []).append(trigger)
+
+    return regressions
+
+
+def get_rerun_map(regressions, release):
+    '''Return dictionary with tests to re-run
+
+    Return dict: release → arch →  trigger_args → pkgs
+    '''
+    rerun_map = {}
+    for release, archmap in regressions.items():
+        for arch, triggermap in archmap.items():
+            # accumulate non-kernel triggers into one request, but run kernel
+            # triggers separately
+            for pkg, pkgtriggers in triggermap.items():
+                triggers = []
+                for trigger in pkgtriggers:
+                    if trigger.startswith('linux-meta'):
+                        rerun_map.setdefault(release, {}).setdefault(
+                            arch, {}).setdefault('--trigger=' + trigger, []).append(pkg)
+                    else:
+                        triggers.append(trigger)
+
+                if triggers:
+                    trigstr = ' '.join(['--trigger=' + t for t in triggers])
+                    rerun_map.setdefault(release, {}).setdefault(
+                        arch, {}).setdefault(trigstr, set()).add(pkg)
+
+    return rerun_map
+
+
+args = parse_args()
+
+extra_opts = ''
+if args.all_proposed:
+    extra_opts += '--all-proposed '
+
+if args.ci_train:
+    excuses_url = 'https://requests.ci-train.ubuntu.com/static/britney/' \
+            '%s/%s/excuses.yaml' % (args.series, args.ci_train)
+    extra_opts += '--ppa ci-train-ppa-service/stable-phone-overlay ' \
+            '--ppa ci-train-ppa-service/%s ' % args.ci_train
+else:
+    excuses_url = 'http://people.canonical.com/~ubuntu-archive/proposed-migration/%s/update_excuses.yaml' % args.series
+regressions = get_regressions(excuses_url, args.series, args.state,
+                              args.min_age, args.max_age)
+rerun_map = get_rerun_map(regressions, args.series)
+for release, archmap in rerun_map.items():
+    for arch, trigmap in archmap.items():
+        for trigger_args, pkgs in trigmap.items():
+            print('run-autopkgtest %s-s %s -a %s %s' % (extra_opts, release, arch, trigger_args),
+                  ' '.join(pkgs))
+>>>>>>> MERGE-SOURCE

=== modified file 'sru-remove'
--- sru-remove	2018-10-30 10:59:16 +0000
+++ sru-remove	2019-03-05 10:27:11 +0000
@@ -117,7 +117,11 @@
 
 if __name__ == '__main__':
 
+<<<<<<< TREE
     default_release = 'cosmic'
+=======
+    default_release = 'xenial'
+>>>>>>> MERGE-SOURCE
     removal_comment = ('The package was removed due to its SRU bug(s) '
                        'not being verified in a timely fashion.')
 

=== modified file 'sru-report'
--- sru-report	2019-02-01 05:39:42 +0000
+++ sru-report	2019-03-05 10:27:11 +0000
@@ -269,12 +269,19 @@
         if not srus[release]:
             continue
         print('''<h3>%s</h3>
+<<<<<<< TREE
 <table id='%s'>
   <tr><th>Package</th><th>-release</th><th>-updates</th>
   <th>-proposed (signer, creator)</th>
   <th>changelog bugs</th><th>days</th></tr>''' % (release, release))
+=======
+<table id='%s'>
+  <tr><th>Package</th><th>-release</th><th>-updates</th><th>-proposed</th>
+  <th>changelog bugs</th><th>days</th></tr>''' % (release, release))
+>>>>>>> MERGE-SOURCE
         for pkg, pub in sorted(pkg_index[release].iteritems(),
                                key=itemgetter(1)):
+<<<<<<< TREE
             # skip everything that shows up on the kernel SRU reports
             if (pkg in ('linux', 'linux-hwe', 'linux-hwe-edge',
                         'linux-kvm', 'linux-oem',
@@ -296,6 +303,17 @@
             if (pkg.startswith('kde-l10n-') and pkg != 'kde-l10n-de'):
                 continue
 
+=======
+            # skip everything that shows up on the kernel SRU reports
+            if (pkg in ('linux', 'linux-keystone',
+                        'linux-armadaxp', 'linux-ti-omap4') or
+                    pkg.startswith('linux-signed') or
+                    pkg.startswith('linux-meta') or
+                    pkg.startswith('linux-lts') or
+                    pkg.startswith('linux-backports-modules')):
+                continue
+
+>>>>>>> MERGE-SOURCE
             rpkg = srus[release][pkg]
             pkgurl = '%s/ubuntu/+source/%s/' % (lp_url, pkg)
             age = (datetime.datetime.now() - rpkg['published'].replace(
@@ -641,6 +659,17 @@
                 distro_series=releases[release]):
             pkg = published.source_package_name
 
+<<<<<<< TREE
+=======
+            # for langpack updates, only keep -en as a representative
+            if (pkg.startswith('language-pack-') and
+                    pkg not in ('language-pack-en', 'language-pack-en-base')):
+                continue
+
+            if (pkg.startswith('kde-l10n-') and pkg != 'kde-l10n-de'):
+                continue
+
+>>>>>>> MERGE-SOURCE
             srus[release][pkg] = current_versions(releases[release], pkg)
             srus[release][pkg]['bugs'] = match_srubugs(
                 srus[release][pkg]['changesfiles'])
@@ -661,6 +690,7 @@
             if pkg in pkg_excuses:
                 for excuse in excuses_data['sources']:
                     if excuse['source'] == pkg:
+<<<<<<< TREE
                         if 'autopkgtest' not in excuse['policy_info']:
                             continue
                         for testpkg in excuse['policy_info']['autopkgtest']:
@@ -674,6 +704,21 @@
                                         testpkg_idx = testpkg_name[0]
                                     autopkg_url = 'http://autopkgtest.ubuntu.com/packages/%s/%s/%s/%s' % (testpkg_idx, testpkg_name, release, arch)
                                     srus[release][pkg]['autopkg_fails'].append('Regression in autopkgtest for <a href="%s">%s (%s)</a>: <a href="%s">test log</a>' % (autopkg_url, testpkg_name, arch, link))
+=======
+                        if 'autopkgtest' not in excuse['tests']:
+                            continue
+                        for testpkg in excuse['tests']['autopkgtest']:
+                            for arch in excuse['tests']['autopkgtest'][testpkg]:
+                                if excuse['tests']['autopkgtest'][testpkg][arch][0] == 'REGRESSION':
+                                    link = excuse['tests']['autopkgtest'][testpkg][arch][1]
+                                    testpkg_name = testpkg.split(' ')[0]
+                                    if testpkg_name.startswith('lib'):
+                                        testpkg_idx = testpkg_name[:3]
+                                    else:
+                                        testpkg_idx = testpkg_name[0]
+                                    autopkg_url = 'http://autopkgtest.ubuntu.com/packages/%s/%s/%s/%s/' % (testpkg_idx, testpkg_name, release, arch)
+                                    srus[release][pkg]['autopkg_fails'].append('Regression in autopkgtest for <a href="%s">%s (%s)</a>: <a href="%s">test log</a>' % (autopkg_url, testpkg, arch, link))
+>>>>>>> MERGE-SOURCE
 
     return srus
 

=== modified file 'sru-review'
--- sru-review	2018-10-30 10:59:16 +0000
+++ sru-review	2019-03-05 10:27:11 +0000
@@ -130,7 +130,11 @@
     uploads = [upload for upload in
                series.getPackageUploads(archive=archive, exact_match=True,
                                         name=sourcepkg, pocket='Proposed',
+<<<<<<< TREE
                                         status=queue, version=version)]
+=======
+                                        status=options.queue, version=version)]
+>>>>>>> MERGE-SOURCE
     if len(uploads) == 0:
         print('ERROR: Queue does not have an upload of this source.',
               file=sys.stderr)
@@ -255,7 +259,11 @@
 
 if __name__ == '__main__':
 
+<<<<<<< TREE
     default_release = 'cosmic'
+=======
+    default_release = 'xenial'
+>>>>>>> MERGE-SOURCE
     ppa_url = ('https://launchpad.net/~%s/+archive/ubuntu/%s/+packages?'
                'field.series_filter=%s')
 

=== modified file 'ubuntu-changes'
--- ubuntu-changes	2018-10-30 10:59:16 +0000
+++ ubuntu-changes	2019-03-05 10:27:11 +0000
@@ -14,7 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+<<<<<<< TREE
 DIST="${DIST:-disco}"
+=======
+DIST="${DIST:-yakkety}"
+>>>>>>> MERGE-SOURCE
 
 MADISON="$(rmadison -a source -s "$DIST" "$1")"
 [ "$MADISON" ] || exit 1
@@ -51,7 +55,11 @@
 			target="${target%;}"
 			target="${target%%-*}"
 			case $target in
+<<<<<<< TREE
 				warty|hoary|breezy|dapper|edgy|feisty|gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco|devel)
+=======
+				warty|hoary|breezy|dapper|edgy|feisty|gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid|wily|xenial|yakkety|devel)
+>>>>>>> MERGE-SOURCE
 					;;
 				*)
 					exit 0

=== added file 'update-output-helper'
--- update-output-helper	1970-01-01 00:00:00 +0000
+++ update-output-helper	2019-03-05 10:27:11 +0000
@@ -0,0 +1,134 @@
+#!/bin/bash
+
+# Run me like this:
+# Download all the Packages files
+# update-output-helper -u
+# Create a worldview that britney is trying to mutate us to
+# update-output-helper package/version package2/version2/ ...
+# outputs an apt-get commandline to use
+# Then call apt with this world view
+# <apt-get command> update
+# <apt-get command> --dry-run install <some uninstallable package>
+# and you can drill down as normal to find which package(s) need fixing
+
+set -e
+
+GETOPT=$(getopt --options uh --long update,help -n "${0}" -- "$@")
+
+eval set -- "${GETOPT}"
+
+ARCH=${ARCH:-$(dpkg-architecture -qDEB_HOST_ARCH)}
+CACHEDIR=${XDG_CACHE_HOME:-$HOME/.cache}/brapt
+APTDIR=${CACHEDIR}/aptroot
+RELEASE=$(ubuntu-distro-info --devel)
+RELEASE_PACKAGES="${CACHEDIR}/Packages_${RELEASE}"
+PROPOSED_PACKAGES="${CACHEDIR}/Packages_${RELEASE}-proposed"
+
+[ ! -d "${CACHEDIR}" ] && mkdir -p "${CACHEDIR}"
+[ ! -d "${APTDIR}" ] && mkdir -p "${APTDIR}"
+
+ensure_programs() {
+    if [ $# -gt 0 ] && ! type "${1}" >/dev/null 2>/dev/null; then
+        echo "Required program $1 not found."
+        exit 1
+    fi
+
+    shift
+
+    if [ $# -gt 0 ]; then
+        ensure_programs $*
+    fi
+}
+
+ensure_apt_structure() {
+    mkdir -p "${APTDIR}/etc/apt/preferences.d" \
+        "${APTDIR}/var/cache/apt/archives/partial" \
+        "${APTDIR}/var/lib/apt/lists"
+    [ ! -e "etc/apt/sources.list" ] && \
+        echo "deb [allow-insecure=yes] file://${APTDIR} ./" > "${APTDIR}/etc/apt/sources.list"
+    touch "${APTDIR}/status"
+}
+
+update() {
+    case ${ARCH} in
+        i386|amd64)
+            local MIRROR="http://archive.ubuntu.com/ubuntu"
+            ;;
+        *)
+            local MIRROR="http://ports.ubuntu.com"
+            ;;
+    esac
+
+    local COMPONENTS=(main universe multiverse restricted)
+    for series in "${RELEASE}" "${RELEASE}-proposed"; do
+        local FILE="${CACHEDIR}/Packages_${series}"
+        [ -e "${FILE}" ] && rm "${FILE}"
+        for component in "${COMPONENTS[@]}"; do
+            local URL="${MIRROR}/dists/${series}/${component}/binary-${ARCH}/Packages.xz"
+            echo "Downloading ${URL}"
+            wget -q -O - "${URL}" | xzcat >> "${CACHEDIR}/Packages_${series}"
+        done
+    done
+}
+
+while true; do
+    case "$1" in
+        -u|--update)
+            update
+            shift
+            ;;
+        -h|--help)
+            echo "Usage: $0 [-u] package/version ..."
+            shift
+            ;;
+        --)
+            shift
+            break
+            ;;
+        *)
+            echo "Error"
+            exit 1;
+            ;;
+    esac
+done
+
+if [ $# -eq 0 ]; then
+    exit 0
+fi
+
+PROPOSED_PATTERN=()
+RELEASE_PATTERN=()
+
+while [ $# -gt 0 ]; do
+    PKG=${1%/*}
+    VERSION=${1#*/}
+    shift
+
+    if [ "${PKG}" = "${VERSION}" ]; then
+        echo "Error: ${PKG} is not in the format PACKAGE/VERSION" >&2
+        exit 1
+    fi
+
+    if [ $# -gt 0 ]; then
+        O="-o "
+    else
+        O=
+    fi
+
+    PKGVER="${PKG} (${VERSION})"
+    # Select:             Packages from the right source/version    or    Packages with different binary version ("Source: sourcepackage (sourceversion)")
+    PROPOSED_PATTERN+=('(' -X -S ${PKG} -a -FVersion ${VERSION} ')' -o '(' -X -S "${PKGVER}" ')' ${O})
+    # Remove:             Packages from the right source/wrong version or       Packages from the right source/wrong version (binary has different version to source)
+    RELEASE_PATTERN+=('(' -X -S ${PKG} -a -! -FVersion ${VERSION} ')' -o '(' '(' -e -S "${PKG} " ')' -a '(' -! -X -S "${PKGVER}" ')' ')' ${O})
+done
+
+ensure_programs wget grep-dctrl xzcat
+
+ensure_apt_structure
+
+cat ${RELEASE_PACKAGES[@]} | grep-dctrl -v "${RELEASE_PATTERN[@]}" > ${APTDIR}/Packages
+cat ${PROPOSED_PACKAGES[@]} | grep-dctrl "${PROPOSED_PATTERN[@]}" >> ${APTDIR}/Packages
+
+apt-get -oDir=${APTDIR} -oDir::State::status=${APTDIR}/status update
+
+echo "apt-get -oDir=${APTDIR} -oDir::State::status=${APTDIR}/status --dry-run install <some broken package> ..."