requestsync: Fix bug where the variable 'hasLP' is not always set (lp: #607874)

This commit is contained in:
Michael Bienia 2010-07-20 19:47:45 +02:00
parent 505af8e20c
commit 0cca58d2bb
2 changed files with 4 additions and 4 deletions

4
debian/changelog vendored
View File

@ -17,8 +17,10 @@ ubuntu-dev-tools (0.101) UNRELEASED; urgency=low
[ Michael Bienia ] [ Michael Bienia ]
* Add "import-bug-from-debian" written by James Westby. * Add "import-bug-from-debian" written by James Westby.
* Add python-soappy to Recommends. * Add python-soappy to Recommends.
* requestsync: Fix bug where the variable 'hasLP' is not always set
(lp: #607874).
-- Michael Bienia <geser@ubuntu.com> Sun, 11 Jul 2010 20:32:49 +0200 -- Michael Bienia <geser@ubuntu.com> Tue, 20 Jul 2010 19:44:18 +0200
ubuntu-dev-tools (0.100) maverick; urgency=low ubuntu-dev-tools (0.100) maverick; urgency=low

View File

@ -81,8 +81,6 @@ if __name__ == '__main__':
from ubuntutools.lp.lpapicache import Distribution from ubuntutools.lp.lpapicache import Distribution
# See if we have LP credentials and exit if we don't - cannot continue in this case # See if we have LP credentials and exit if we don't - cannot continue in this case
hasLP = True
try: try:
Launchpad.login() Launchpad.login()
except IOError: except IOError:
@ -143,7 +141,7 @@ if __name__ == '__main__':
sys.exit(1) sys.exit(1)
# Stop if Ubuntu has already the version from Debian or a newer version # Stop if Ubuntu has already the version from Debian or a newer version
if (ubuntu_version >= debian_version) and hasLP: if (ubuntu_version >= debian_version) and options.lpapi:
# try rmadison # try rmadison
import ubuntutools.requestsync.mail import ubuntutools.requestsync.mail
try: try: