~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2008-04-21 16:05:33 UTC
  • mfrom: (3375 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3376.
  • Revision ID: john@arbash-meinel.com-20080421160533-abpkc2ahl7h5m3nl
resolve NEWS conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
93
93
                if _lp_login is None:
94
94
                    if not _warned_login:
95
95
                        trace.warning('You have not informed bzr of your '
96
 
                                'launchpad login. If you are attempting a '
97
 
                                'write operation it may fail. If it does, '
98
 
                                'run "bzr launchpad-login YOUR_ID" to '
99
 
                                'set your login and try again.')
 
96
                                'launchpad login. If you are attempting a\n'
 
97
                                'write operation and it fails, run '
 
98
                                '"bzr launchpad-login YOUR_ID" and try again.')
100
99
                        _warned_login = True
101
100
                    continue
102
101
                url = urlunsplit((scheme, '%s@%s' % (_lp_login, netloc),