diff --git a/common.py b/common.py index 15ea5e4..5f0b6ec 100644 --- a/common.py +++ b/common.py @@ -86,23 +86,23 @@ def checkSourceExists(package, release): m = re.search('"/ubuntu/%s/\+source/%s/(\d[^"]+)"' % (release, package.replace('+', '\+')), page) if not m: - print >> sys.stderr, "Unable to find this source package (%s) in " \ - "this release (%s)." % (package, release.capitalize()) + print >> sys.stderr, "Unable to find this source package '%s' in " \ + "the %s release." % (package, release.capitalize()) sys.exit(1) except urllib2.HTTPError, error: # Raised on 404. if error.code == 404: - print >> sys.stderr, "The source package (%s) does not appear to " \ + print >> sys.stderr, "The source package '%s' does not appear to " \ "exist in Ubuntu." % package else: # Other error code, probably Launchpad malfunction. - print >> sys.stderr, "Error when checking Launchpad for package: " \ + print >> sys.stderr, "Error while checking Launchpad for package: " \ "%s." % error.code sys.exit(1) # Exit. Error encountered. except urllib2.URLError, error: # Other error (NXDOMAIN, ...) (_, reason) = error.reason - print >> sys.stderr, "Error when checking Launchpad for package: %s." % \ + print >> sys.stderr, "Error while checking Launchpad for package: %s." % \ reason sys.exit(1) diff --git a/massfile b/massfile index 54fa27d..bdb0e00 100755 --- a/massfile +++ b/massfile @@ -99,7 +99,7 @@ def file_bug(config): "target": "ubuntu"}, summary=summary, description=description) - print "Successfully filed bug %s: http://launchpad.net/bugs/%s" % \ + print "Successfully filed bug %s: https://launchpad.net/bugs/%s" % \ (bug.bugnumber, bug.bugnumber) for sub in config["subscribers"].split(","): if sub.strip("\n").strip(): diff --git a/pull-lp-source b/pull-lp-source index 2482585..87f9641 100755 --- a/pull-lp-source +++ b/pull-lp-source @@ -52,7 +52,7 @@ class BackportFromLP: links = re.findall('a href=\"(.*\.dsc)\"', contents) if len(links) == 1 and \ - subprocess.call(['dget', '-xu', 'http://launchpad.net%s' % links[0]]) == 0: + subprocess.call(['dget', '-xu', 'https://launchpad.net%s' % links[0]]) == 0: print '\nSuccess!' else: raise ValueError, '\nFailed to fetch and extract the source. ' +\