[Merge] lp:~evfool/software-properties/1044674 into lp:software-properties

[Robert Roth]

Robert Roth has proposed merging lp:~evfool/software-properties/1044674 into lp:software-properties.

Requested reviews:
  Ubuntu Core Development Team (ubuntu-core-dev)
Related bugs:
  Bug #1044674 in software-properties (Ubuntu): "add-apt-repository crashed with NameError in get_ppa_info_from_lp(): global name 'pycurl' is not defined"
  https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/1044674

For more details, see:
https://code.launchpad.net/~evfool/software-properties/1044674/+merge/123363

Fixed an error occasionally happening when an unexcepted exception happens in any of the urllib calls, and in the except block we're trying to use pycurl without importing it (as pycurl is only imported if urllib imports throw an importerror, but if the exception is thrown from urllib calls, it means that urllib has been successfully imported, thus we don't have pycurl imported)
-- 
https://code.launchpad.net/~evfool/software-properties/1044674/+merge/123363
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~evfool/software-properties/1044674 into lp:software-properties.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 341 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20120907/f23b50d2/attachment-0001.diff>