~ubuntu-branches/ubuntu/maverick/landscape-client/maverick

« back to all changes in this revision

Viewing changes to landscape/lib/fetch.py

  • Committer: Bazaar Package Importer
  • Author(s): Christopher Armstrong
  • Date: 2009-04-09 17:09:50 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090409170950-mc5mqadawk0ls2vc
Tags: 1.0.29-0ubuntu0.9.04.0
* New upstream bugfix release (LP: #358744)
  - Add a timeout to HTTP operations to avoid hanging (LP: #349737)
  - Clean up environment variables on startup to avoid propagating
    variables that will corrupt package installation (LP: #348681)
  - Clean up FDs on startup for the same reason (LP: #352458)
  - Catch and handle certain errors from smart (such as invalid package
    data) to avoid "stuck" Landscape activities (LP: #268745)
  - Don't print warnings meant for developers to the console (LP: #336669)

Show diffs side-by-side

added added

removed removed

Lines of Context:
53
53
    curl.setopt(pycurl.URL, url)
54
54
    curl.setopt(pycurl.FOLLOWLOCATION, True)
55
55
    curl.setopt(pycurl.MAXREDIRS, 5)
 
56
    curl.setopt(pycurl.CONNECTTIMEOUT, 30)
 
57
    curl.setopt(pycurl.TIMEOUT, 600)
56
58
    curl.setopt(pycurl.WRITEFUNCTION, input.write)
57
59
 
58
60
    curl.perform()