← Back to branch summary

~laney/ubuntu-archive-tools/queue-fetch-copies

« back to all changes in this revision

Viewing changes to component-mismatches

  • Committer: Adam Conrad
  • Date: 2013-04-09 02:22:15 UTC
  • Revision ID: adconrad@0c3.net-20130409022215-a76trbzt3rqg1aog
Fix inverted security/updates ogre model logic

Show diffs side-by-side

added added

removed removed

Lines of Context:
component-mismatches
578
578
        options.suite = options.distro.current_series.name
579
579
 
580
580
    # Considering all the packages to have a full installable suite. So:
581
 
    # -updates = release + -updates
582
 
    # -security = release + -updates + -security
 
581
    # -security = release + -security
 
582
    # -updates = release + -updates + -security
583
583
    # -proposed = release + updates + security + proposed
584
584
    if "-" in options.suite:
585
585
        options.suite, options.pocket = options.suite.split("-")
586
586
        if options.pocket in ["updates", "security", "proposed"]:
 
587
            options.pockets.append("security")
 
588
        if options.pocket in ["updates", "proposed"]:
587
589
            options.pockets.append("updates")
588
 
        if options.pocket in ["security", "proposed"]:
589
 
            options.pockets.append("security")
590
590
        if options.pocket in ["proposed"]:
591
591
            options.pockets.append("proposed")
592
592
    options.pockets.append(options.suite)