← Back to branch summary

~sil2100/cupstream2distro/dont_multi_merge

« back to all changes in this revision

Viewing changes to cupstream2distro/packagemanager.py

Overhaul launchpadmanager.

Approved by PS Jenkins bot, ⍨ Robert Bruce Park ⍨.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cupstream2distro/packagemanager.py
33
33
from subprocess import Popen, PIPE
34
34
from operator import attrgetter
35
35
 
36
 
from cupstream2distro import launchpadmanager
 
36
from cupstream2distro.launchpadmanager import lp
37
37
from cupstream2distro import settings
38
38
from cupstream2distro.utils import (
39
39
    SILO_DIR,
66
66
                                   all_packages=False):
67
67
    """Get current version for a package name in that series."""
68
68
    if not dest:
69
 
        if ppa_name:
70
 
            dest = launchpadmanager.get_ppa(ppa_name)
71
 
        else:
72
 
            dest = launchpadmanager.get_ubuntu_archive()
73
 
    series = launchpadmanager.get_series(series_name, dest.distribution.name)
 
69
        dest = lp.get_ppa(ppa_name) if ppa_name else lp.main_archive
 
70
    series = lp.get_series(series_name, dest=dest)
74
71
    source_collection = dest.getPublishedSources(
75
72
        exact_match=True,
76
73
        source_name=source_package_name,
284
281
            download_dir))
285
282
    source_package_download_dir = os_path_join_safe(
286
283
        SILO_DIR(), download_dir, source_package_name)
287
 
    series = launchpadmanager.get_series(
288
 
        series_name, dest_archive.distribution.name)
 
284
    series = lp.get_series(series_name, dest=dest_archive)
289
285
    with ignored(OSError):
290
286
        os.makedirs(source_package_download_dir)
291
287
 
818
814
 
819
815
    logging.info("Check that all package sources are published in destination")
820
816
    one_package_not_in_dest = False
821
 
    dest = launchpadmanager.get_resource_from_token(silo_state.dest)
822
 
    series = launchpadmanager.get_resource_from_token(silo_state.series)
 
817
    dest = lp.load(silo_state.dest)
 
818
    series = lp.load(silo_state.series)
823
819
    additional_messages = ""
824
820
    for source in packages_in_dest:
825
821
        in_dest = is_version_for_series_in_dest(
842
838
            # if destination is the archive, try to check if it's in proposed
843
839
            # or in any queue
844
840
 
845
 
            if launchpadmanager.is_dest_link_distro_archive(silo_state.dest):
 
841
            if lp.is_link_distro_archive(silo_state.dest):
846
842
                if is_version_for_series_in_dest(
847
843
                        source,
848
844
                        packages_in_dest[source],