~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/codehosting/codeimport/worker.py

Committer: Stuart Bishop
Date: 2011-09-05 16:39:40 UTC
mfrom: (13813.1.8 disco)
mto: (13813.2.13 pgbouncer-fixture-noca)
mto: This revision was merged to the branch mainline in revision 13928.
Revision ID: stuart.bishop@canonical.com-20110905163940-hyrrkl0qswl7pz3z

Merged disco into pgbouncer-fixture.

files added:
lib/canonical/launchpad/scripts/tests/hardwaretest-natty.xml

lib/lp/hardwaredb/scripts/tests

lib/lp/hardwaredb/scripts/tests/__init__.py

lib/lp/hardwaredb/scripts/tests/test_hwdbsubmissions.py

scripts/reprocess-hwdb-submissions.py

files modified:
cronscripts/process-hwdb-submissions.py

lib/canonical/launchpad/scripts/tests/test_hwdb_submission_parser.py

lib/canonical/launchpad/scripts/tests/test_hwdb_submission_processing.py

lib/lp/code/mail/codereviewcomment.py

lib/lp/code/mail/tests/test_codereviewcomment.py

lib/lp/codehosting/codeimport/tests/test_workermonitor.py

lib/lp/codehosting/codeimport/worker.py

lib/lp/hardwaredb/scripts/hwdbsubmissions.py

lib/lp/hardwaredb/tests/test_hwdb_submission_validation.py

lib/lp/registry/help/init-series-title-help.html

lib/lp/registry/templates/distroseries-localdifferences.pt

lib/lp/soyuz/interfaces/publishing.py

lib/lp/soyuz/model/publishing.py

lib/lp/soyuz/scripts/ftpmaster.py

lib/lp/soyuz/tests/test_publishing.py

lib/lp/testing/factory.py

versions.cfg

Show diffs side-by-side

added added

removed removed

lib/lp/codehosting/codeimport/worker.py

705

except BadUrl, e:

706

self._logger.info("Invalid URL: %s" % e)

707

return CodeImportWorkerExitCode.FAILURE_FORBIDDEN

708

except ConnectionError, e:

709

self._logger.info("Unable to open remote branch: %s" % e)

710

return CodeImportWorkerExitCode.FAILURE_INVALID

708

711

try:

709

712

remote_branch_tip = remote_branch.last_revision()

710

713

inter_branch = InterBranch.get(remote_branch, bazaar_branch)

Older »