← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/soyuz/model/queue.py

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/soyuz/model/queue.py
1502
1502
        if name is not None and name != '':
1503
1503
            spn_join = LeftJoin(
1504
1504
                SourcePackageName,
1505
 
                match_column(SourcePackageName.name, name))
 
1505
                SourcePackageName.id ==
 
1506
                    SourcePackageRelease.sourcepackagenameID)
1506
1507
            bpn_join = LeftJoin(
1507
1508
                BinaryPackageName,
1508
 
                match_column(BinaryPackageName.name, name))
 
1509
                BinaryPackageName.id ==
 
1510
                    BinaryPackageRelease.binarypackagenameID)
1509
1511
            custom_join = LeftJoin(
1510
1512
                PackageUploadCustom,
1511
1513
                PackageUploadCustom.packageuploadID == PackageUpload.id)
1516
1518
 
1517
1519
            joins += [
1518
1520
                package_copy_job_join,
 
1521
                source_join,
 
1522
                spr_join,
1519
1523
                spn_join,
1520
 
                source_join,
1521
 
                spr_join,
 
1524
                build_join,
 
1525
                bpr_join,
1522
1526
                bpn_join,
1523
 
                build_join,
1524
 
                bpr_join,
1525
1527
                custom_join,
1526
1528
                file_join,
1527
1529
                ]
1529
1531
            # One of these attached items must have a matching name.
1530
1532
            conditions.append(Or(
1531
1533
                match_column(PackageCopyJob.package_name, name),
1532
 
                SourcePackageRelease.sourcepackagenameID ==
1533
 
                    SourcePackageName.id,
1534
 
                BinaryPackageRelease.binarypackagenameID ==
1535
 
                    BinaryPackageName.id,
 
1534
                match_column(SourcePackageName.name, name),
 
1535
                match_column(BinaryPackageName.name, name),
1536
1536
                match_column(LibraryFileAlias.filename, name)))
1537
1537
 
1538
1538
        if version is not None and version != '':