← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/soyuz/model/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/model/archive.py
1288
1288
            #   - the given source package directly
1289
1289
            #   - a package set in the correct distro series that includes the
1290
1290
            #     given source package
1291
 
            source_allowed = self.checkArchivePermission(person,
1292
 
                                                         sourcepackagename)
 
1291
            source_allowed = self.checkArchivePermission(
 
1292
                person, sourcepackagename)
1293
1293
            set_allowed = self.isSourceUploadAllowed(
1294
1294
                sourcepackagename, person, distroseries)
1295
1295
            if source_allowed or set_allowed:
1296
1296
                return None
1297
1297
 
1298
1298
        if not self.getComponentsForUploader(person):
1299
 
            # XXX: JamesWestby 2010-08-01 bug=612351: We have to use
1300
 
            # is_empty() as we don't get an SQLObjectResultSet back, and
1301
 
            # so __nonzero__ isn't defined on it, and a straight bool
1302
 
            # check wouldn't do the right thing.
1303
1299
            if self.getPackagesetsForUploader(person).is_empty():
1304
1300
                return NoRightsForArchive()
1305
1301
            else: