Merge lp:~stgraber/ubuntu-archive-tools/pkgsets-improvements into lp:ubuntu-archive-tools

[Stéphane Graber]

First commit is a bugfix as we LP stores packagesets per series but the existing code wasn't passing the distroseries.
Second commit is a quick hack to implement do_copy allowing for packageset copies between series, useful for the DMB.

[lp:~stgraber/ubuntu-archive-tools/pkgsets-improvements]

398. By Colin Watson on 2012-04-19

process-removals.py: fetch removals.txt rather than removals-full.txt if mirroring a removal from the current year

399. By Colin Watson on 2012-04-19

archive-cruft-check: add -v/--verbose option

400. By Martin Pitt on 2012-04-20

copy-proposed-kernel.py: Add queue URL to output

401. By Martin Pitt on 2012-04-20

copy-proposed-kernel.py: revert previous commit, still using copyPackage()

402. By Martin Pitt on 2012-04-20

copy-proposed-kernel.py: Move to asynchronous copyPackage()

403. By Martin Pitt on 2012-04-24

queuediff: switch default to precise

404. By Martin Pitt on 2012-04-25

publish-image-set.py: recognize "Pre-release" milestone

405. By Colin Watson on 2012-04-25

publish-image-set.py: add Wubi support

406. By Colin Watson on 2012-04-25

process-removals.py: add a --force option to force the removal of a single package despite it being back in unstable

407. By Colin Watson on 2012-04-25

add new branch-seeds script to branch a set of seed collections when opening a new series

408. By Martin Pitt on 2012-04-26

sru-release: use ubuntu.current_series instead of ubuntu.getDevelopmentSeries(), as that also covers frozen releases

409. By Colin Watson on 2012-04-26

branch-seeds: bind newly-created branches

410. By Colin Watson on 2012-04-26

drop maverick

411. By Colin Watson on 2012-04-26

sru-accept.py: switch default to precise

412. By Colin Watson on 2012-04-26

precise -> quantal

413. By Colin Watson on 2012-04-30

auto-sync: retry .dsc pulling on SSL errors

414. By Colin Watson on 2012-04-30

auto-sync: add --no-new option

415. By Colin Watson on 2012-05-02

auto-sync: copy large numbers of packages in smaller chunks if necessary

416. By Colin Watson on 2012-05-02

auto-sync: improve test for sources being published in source series

417. By Colin Watson on 2012-05-02

process-removals.py: call checkrdepends with series name

418. By Colin Watson on 2012-05-02

process-removals.py: call seeded-in-ubuntu

419. By Colin Watson on 2012-05-04

auto-sync: complete more gracefully if nothing to do

420. By Colin Watson on 2012-05-04

sru-report: use list comprehensions rather than filter (which returns an iterator in Python 3)

421. By Colin Watson on 2012-05-04

isotracker_xmlrpc.py: prefer Python 3 configparser name

422. By Colin Watson on 2012-05-04

backport-helper.py, edit_acl.py: use input() rather than raw_input() when running under Python 3

423. By Colin Watson on 2012-05-04

Handle Python 3 urllib/urllib2 reorganisation.

424. By Colin Watson on 2012-05-04

sync-helper.py: drop an explicit Unicode literal; this syntax won't work in Python 3, and in this case it's unnecessary in Python 2

425. By Colin Watson on 2012-05-04

synclib.py: remove support for reading request output through a pipe, and update all callers; its only user (in mass-sync.py) didn't really need it

426. By Colin Watson on 2012-05-04

Open subprocesses with universal_newlines=True when expecting to read text from them.

427. By Colin Watson on 2012-05-04

Use context managers in a few more places.

428. By Colin Watson on 2012-05-15

auto-sync: only note blacklisted packages and packages with no published sources in the source series when --verbose is given

429. By Colin Watson on 2012-05-16

synclib.py: fix return type confusion between different code paths

430. By Colin Watson on 2012-05-16

Switch to backportpackage and decommission backport-source. (The archive admin interface to backports is hereby deprecated, and backporters should DIY.)

431. By Colin Watson on 2012-05-16

process-removals.py: switch from checkrdepends to reverse-depends for reverse dependency analysis

432. By Colin Watson on 2012-05-16

new-source-filter.py: remove; obsoleted by new auto-sync script

433. By Colin Watson on 2012-05-18

auto-sync: deduplicate differences

434. By Colin Watson on 2012-05-18

isotracker_xmlrpc.py, post-image-to-iso-tracker.py: allow getting per-series default milestone

435. By Colin Watson on 2012-05-18

isotracker_xmlrpc.py: fix error handling

436. By Colin Watson on 2012-05-18

import-blacklist.py, sync-blacklist.py: new programs from Iain Lane and Stefano Rivera

437. By Colin Watson on 2012-05-18

sync-blacklist.py: remove unused import

438. By Colin Watson on 2012-05-18

import-blacklist.py, sync-blacklist.py: make Launchpad instance a command-line option

439. By Colin Watson on 2012-05-19

import-blacklist.py, sync-blacklist.py: make Python 3-compatible; use input/output files as arguments to avoid having to mess with sys.stdin/sys.stdout encoding

440. By Colin Watson on 2012-05-19

import-blacklist.py: add -n/--dry-run option

441. By Colin Watson on 2012-05-22

priority-mismatches: allow libdrm-intel1 and libpciaccess0 to be optional on amd64/i386 when they should be required, due to architecture-specific plymouth requirement

442. By Colin Watson on 2012-05-23

component-mismatches: allow overriding default suite and flavours on the command line

443. By Colin Watson on 2012-05-23

component-mismatches: modernise terminology (distro -> flavour)

444. By Colin Watson on 2012-05-23

component-mismatches: use more neutral language for movements between main and universe

445. By Colin Watson on 2012-05-23

auto-sync: add a --batch mode that assumes the default answer to all questions

446. By Colin Watson on 2012-05-23

auto-sync: list updated and new source packages separately at end of output

447. By Colin Watson on 2012-05-23

auto-sync: Skip new packages already in NEW queue

448. By Colin Watson on 2012-05-23

auto-sync: Only look at syncs and source uploads in NEW

449. By Colin Watson on 2012-05-24

Be a little more careful about opening files in binary mode.

450. By Colin Watson on 2012-05-24

auto-sync: Cache queries for Distribution.main_archive.

451. By Colin Watson on 2012-05-24

auto-sync: Add a fallback mode where we compute the set of changes using Debian Sources files rather than DistroSeriesDifferences. Use this by default, as testing reveals that the results of this are strictly more correct than DSDs right now.

452. By Colin Watson on 2012-05-25

auto-sync: fix parent_source_version caching

453. By Colin Watson on 2012-05-25

auto-sync: default to syncing from unstable

[Colin Watson (cjwatson)]

Looks good to me, thanks! There's one more small tweak needed for Python 3 compatibility, but I can take care of that.

[Colin Watson (cjwatson)]

review: Approve

[lp:~stgraber/ubuntu-archive-tools/pkgsets-improvements]

454. By Colin Watson on 2012-05-25

merge lp:~stgraber/ubuntu-archive-tools/pkgsets-improvements

=== modified file 'edit_acl.py'
--- edit_acl.py	2012-01-17 02:24:34 +0000
+++ edit_acl.py	2012-04-18 16:01:42 +0000
@@ -344,19 +344,68 @@
         print("You must specify exactly one person to own the new package set.")
         return False
 
+    if options.series:
+        distro_series = launchpad.distributions['ubuntu'].getSeries(
+                name_or_version=options.series)
+    else:
+        distro_series = launchpad.distributions['ubuntu'].getDevelopmentSeries()[0]
+
     lp_person = launchpad.people[options.person[0]]
 
     for packageset in options.packageset:
         try:
-            if launchpad.packagesets.getByName(name=packageset):
+            if launchpad.packagesets.getByName(
+                    name=packageset, distroseries=distro_series):
                 print("Package set %s already exists" % packageset)
                 continue
         except (TypeError, launchpadlib.errors.HTTPError):
             pass
         desc = raw_input("Description for new package set %s: " % packageset)
         ps = launchpad.packagesets.new(name=packageset, description=desc,
-                                       owner=lp_person)
-        print(ps)
+                                distroseries=distro_series, owner=lp_person)
+        print(ps)
+
+
+def do_copy(options):
+    if options.archive is None:
+        archives = launchpad.distributions['ubuntu'].archives
+    else:
+        archives = [get_archive(options, launchpad)]
+
+    if not options.packageset:
+        print("You can only copy a package set, not something else.")
+        return False
+
+    if options.series:
+        distro_series = launchpad.distributions['ubuntu'].getSeries(
+                name_or_version=options.series)
+    else:
+        distro_series = launchpad.distributions['ubuntu'].getDevelopmentSeries()[0]
+
+    dst = raw_input("Name of the destination series: ")
+    dst_series = launchpad.distributions['ubuntu'].getSeries(name_or_version=dst)
+
+    for packageset in options.packageset:
+        src_pkgset = launchpad.packagesets.getByName(
+                        name=packageset, distroseries=distro_series)
+        if not src_pkgset:
+            print("Package set %s doesn't exist" % packageset)
+
+        ps = launchpad.packagesets.new(name=packageset, description=src_pkgset.description,
+                                distroseries=dst_series, owner=src_pkgset.owner_link)
+        print(ps)
+
+        ps.addSources(names=src_pkgset.getSourcesIncluded())
+
+        perms = []
+        for archive in archives:
+            perms.extend(archive.getUploadersForPackageset(
+                packageset=src_pkgset))
+
+        for perm in perms:
+            archive.newPackagesetUploader(
+                person=perm.person_link, packageset=ps)
+
 
 
 def do_check(options):
@@ -417,6 +466,8 @@
         do_delete(options)
     elif action == "create":
         do_create(options)
+    elif action == "copy":
+        do_copy(options)
     elif action == "check":
         do_check(options)
     else:
@@ -426,7 +477,7 @@
 
 
 if __name__ == '__main__':
-    parser = OptionParser(usage="usage: %prog [options] query|add|delete|create|check")
+    parser = OptionParser(usage="usage: %prog [options] query|add|delete|create|copy|check")
 
     parser.add_option(
         "-l", "--launchpad", dest="launchpad_instance", default="production")
@@ -443,7 +494,7 @@
 
     options, args = parser.parse_args()
 
-    possible_actions = ('query', 'add', 'delete', 'create', 'check')
+    possible_actions = ('query', 'add', 'delete', 'create', 'copy', 'check')
 
     if len(args) != 1:
         parser.error(