← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/archiveuploader/uploadprocessor.py

  • Committer: William Grant
  • Date: 2011-09-29 04:12:59 UTC
  • mto: This revision was merged to the branch mainline in revision 14071.
  • Revision ID: william.grant@canonical.com-20110929041259-b182ro14hhqeu0zl
Rip out FatalUploadError. 'twas pointless.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/archiveuploader/uploadprocessor.py
63
63
from lp.app.errors import NotFoundError
64
64
from lp.archiveuploader.nascentupload import (
65
65
    EarlyReturnUploadError,
66
 
    FatalUploadError,
67
66
    NascentUpload,
68
67
    UploadError,
69
68
    )
374
373
        try:
375
374
            upload = NascentUpload.from_changesfile_path(
376
375
                changesfile_path, policy, self.processor.log)
377
 
        except (FatalUploadError, UploadError), e:
 
376
        except UploadError, e:
 
377
            # We failed to parse the changes file, so we have no key or
 
378
            # Changed-By to notify of the rejection. Just log it and
 
379
            # move on.
 
380
            # XXX wgrant 2011-09-29 bug=499438: With some refactoring we
 
381
            # could do better here: if we have a signature then we have
 
382
            # somebody to email, even if the rest of the file is
 
383
            # corrupt.
378
384
            logger.debug("Failed to parse changes file: %s" % str(e))
379
385
            logger.debug("Nobody to notify.")
380
386
            return UploadStatusEnum.REJECTED
407
413
                              "%s " % e)
408
414
                logger.debug(
409
415
                    "UploadPolicyError escaped upload.process", exc_info=True)
410
 
            except FatalUploadError, e:
411
 
                upload.reject("UploadError escaped upload.process: %s" % e)
412
 
                logger.debug(
413
 
                    "UploadError escaped upload.process", exc_info=True)
414
416
            except (KeyboardInterrupt, SystemExit):
415
417
                raise
416
418
            except EarlyReturnUploadError: