← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/soyuz/scripts/gina/archive.py

  • Committer: Raphael Badin
  • Date: 2012-01-06 08:27:55 UTC
  • mfrom: (14513.5.4 builder-history-lfa)
  • mto: This revision was merged to the branch mainline in revision 14654.
  • Revision ID: raphael.badin@canonical.com-20120106082755-95a0eh6nakv5hj3b
Merge devel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/soyuz/scripts/gina/archive.py
199
199
            # because most of them are the same for all architectures,
200
200
            # but we go over it to also cover source packages that only
201
201
            # compile for one architecture.
202
 
            sources = apt_pkg.ParseTagFile(info_set.srcfile)
203
 
            while sources.Step():
 
202
            sources = apt_pkg.TagFile(info_set.srcfile)
 
203
            for section in sources:
204
204
                try:
205
 
                    src_tmp = dict(sources.Section)
 
205
                    src_tmp = dict(section)
206
206
                    src_tmp['Component'] = info_set.component
207
207
                    src_name = src_tmp['Package']
208
208
                except KeyError:
222
222
 
223
223
            tmpbin_map = self.bin_map[info_set.arch]
224
224
 
225
 
            binaries = apt_pkg.ParseTagFile(info_set.binfile)
226
 
            while binaries.Step():
 
225
            binaries = apt_pkg.TagFile(info_set.binfile)
 
226
            for section in binaries:
227
227
                try:
228
 
                    bin_tmp = dict(binaries.Section)
 
228
                    bin_tmp = dict(section)
229
229
                    # The component isn't listed in the tagfile.
230
230
                    bin_tmp['Component'] = info_set.component
231
231
                    bin_name = bin_tmp['Package']
237
237
                tmpbin_map[bin_name] = bin_tmp
238
238
 
239
239
            # Run over the D-I stanzas and store info in tmp_bin_map.
240
 
            dibinaries = apt_pkg.ParseTagFile(info_set.difile)
241
 
            while dibinaries.Step():
 
240
            dibinaries = apt_pkg.TagFile(info_set.difile)
 
241
            for section in dibinaries:
242
242
                try:
243
 
                    dibin_tmp = dict(dibinaries.Section)
 
243
                    dibin_tmp = dict(section)
244
244
                    dibin_tmp['Component'] = info_set.component
245
245
                    dibin_name = dibin_tmp['Package']
246
246
                except KeyError: