Merge lp:~xnox/bzr-builddeb/updates into lp:~james-w/bzr-builddeb/import-scripts

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

https://help.launchpad.net/Code/UploadingABranch#Pushing your Bazaar branch to Launchpad

How to setup ssh config ;-)))))

[James Westby (james-w)]

Good point :-)

Merged, thanks,

James

review: Approve

=== modified file 'import_package.py'
--- import_package.py	2009-12-10 14:10:07 +0000
+++ import_package.py	2009-12-17 15:23:12 +0000
@@ -240,7 +240,7 @@
     distro, suite = translate_lp_suite(distro, suite)
     now = datetime.datetime.utcnow()
     now_str = now.strftime("%Y%m%d%H%M")
-    return ("bzr+ssh://[e-mail]/~ubuntu-branches/%s/"
+    return ("bzr+ssh://bazaar.launchpad.net/~ubuntu-branches/%s/"
             "%s/%s/%s" % (distro, release, package, suite + "-%s" % now_str))
 
 
@@ -252,11 +252,11 @@
         lp_branch = icommon.lp_call(lp_sp.getBranch, pocket=pocket[0].upper() + pocket[1:])
     if lp_branch is None:
         distro, suite = translate_lp_suite(distro, make_suite(release, pocket))
-        return ("bzr+ssh://[e-mail]/~ubuntu-branches/%s/"
+        return ("bzr+ssh://bazaar.launchpad.net/~ubuntu-branches/%s/"
                 "%s/%s/%s" % (distro, release, package, suite))
     else:
         lp_branch_path = urlparse.urlparse(lp_branch.self_link).path[len("/beta"):]
-        return "bzr+ssh://[e-mail]" + lp_branch_path
+        return "bzr+ssh://bazaar.launchpad.net" + lp_branch_path
 
 
 def create_branch(path):