~jcsackett/charmworld/bac-tag-constraints

« back to all changes in this revision

Viewing changes to charmworld/jobs/lp.py

[r=sinzui][bug=1208477][author=abentley] Remove doctype attribute.

Show diffs side-by-side

added added

removed removed

Lines of Context:
92
92
    log = logging.getLogger("charm.launchpad")
93
93
    if import_filter is default:
94
94
        import_filter = CHARM_IMPORT_FILTER
95
 
    all_ = dict((charm['branch_spec'], charm) for charm in db_charms(db))
96
 
    all_.update((charm['branch_spec'], charm) for charm in available)
97
 
    all_ = sorted(all_.values(), key=lambda charm: charm['branch_spec'])
 
95
    all = dict((charm['branch_spec'], charm) for charm in db_charms(db))
 
96
    all.update((charm['branch_spec'], charm) for charm in available)
 
97
    all = sorted(all.values(), key=lambda charm: charm['branch_spec'])
98
98
 
99
99
    count = 0
100
 
    for charm in all_:
 
100
    for charm in all:
101
101
        if import_filter and not charm['branch_spec'].startswith(
102
102
                import_filter):
103
103
            continue
104
 
        log.info("Queueing charm %s", charm['branch_spec'])
 
104
        log.info("Queueing %s", charm['branch_spec'])
105
105
        yield charm
106
106
        count += 1
107
107
        if limit and count >= limit:
124
124
        if added and 0:
125
125
            log.info("Queued %s", charm)
126
126
    for basket in baskets:
127
 
        log.info("Queueing bundle %s", basket['branch_spec'])
128
127
        basket_queue.put(basket)
129
128
 
130
129