← Back to branch summary

~sil2100/ubuntu-archive-tools/sru-review-invalid-bugs

« back to all changes in this revision

Viewing changes to kernel-sru-review

  • Committer: Łukasz 'sil2100' Zemczak
  • Date: 2018-02-13 16:41:39 UTC
  • Revision ID: lukasz.zemczak@canonical.com-20180213164139-f5kv4gvqsqnkq67d
kernel-sru-review: improve error handling for master kernel diff when master kernel is not available anywhere yet.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel-sru-review
86
86
        if len(srcpkgs) == 0 and 'non-esm' in archive:
87
87
            target = archive['non-esm']
88
88
            srcpkgs = target.getPublishedSources(**kwargs)
 
89
    if len(srcpkgs) == 0:
 
90
        raise KernelWorkflowError(
 
91
            "Selected %s kernel could not be found" % source)
89
92
    srcpkg = srcpkgs[0]
90
93
    source_ver = srcpkg.source_package_version
91
94
    source_dsc = list(filter(
104
107
                              work_dir, tardir, start_dir):
105
108
    master_upstream = master_version.split('-')[0]
106
109
 
107
 
    master_dsc, master_version = get_kernel_dsc(
108
 
        me, archive, master_source, version=master_version)
 
110
    try:
 
111
        master_dsc, master_version = get_kernel_dsc(
 
112
            me, archive, master_source, version=master_version)
 
113
    except KernelWorkflowError:
 
114
        print("A master kernel diff was requested but the listed master "
 
115
              "kernel could not be found in any known archive.",
 
116
              end="")
 
117
        sys.stdout.flush()
 
118
        sys.stdin.readline()
 
119
        return
 
120
 
109
121
    fetch_tarball_from_cache(
110
122
        work_dir, tardir, master_source, master_upstream, start_dir)
111
123