← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_directory.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-10-17 22:03:36 UTC
  • mfrom: (3777.1.22 remove-url-username)
  • Revision ID: pqm@pqm.ubuntu.com-20081017220336-a1m0npnjf9ojnfbj
Include staging in lp-login, remove username from lp: urls (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_directory.py
90
90
                                              fragment):
91
91
                # Only accept launchpad.net bzr+ssh URLs if we know
92
92
                # the user's Launchpad login:
 
93
                if _lp_login is not None:
 
94
                    break
93
95
                if _lp_login is None:
94
96
                    if not _warned_login:
95
97
                        trace.warning('You have not informed bzr of your '
97
99
                                'write operation and it fails, run '
98
100
                                '"bzr launchpad-login YOUR_ID" and try again.')
99
101
                        _warned_login = True
100
 
                    continue
101
 
                url = urlunsplit((scheme, '%s@%s' % (_lp_login, netloc),
102
 
                                  path, query, fragment))
103
 
                break
104
102
            else:
105
103
                # Use the URL if we can create a transport for it.
106
104
                try: