← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Martin Pool
  • Date: 2005-04-15 01:36:53 UTC
  • Revision ID: mbp@hope-20050415013653-3b3c9c3d33fae0a6
- More handling of auto-username case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
155
155
            realname = gecos
156
156
        else:
157
157
            realname = gecos[:comma]
 
158
        if not realname:
 
159
            realname = username
158
160
 
159
161
    except ImportError:
160
 
        realname = ''
161
162
        import getpass
162
 
        username = getpass.getuser().decode(bzrlib.user_encoding)
 
163
        realname = username = getpass.getuser().decode(bzrlib.user_encoding)
163
164
 
164
 
    return realname, (username + '@' + os.gethostname())
 
165
    return realname, (username + '@' + socket.gethostname())
165
166
 
166
167
 
167
168
def _get_user_id():
174
175
                .read()
175
176
                .decode(bzrlib.user_encoding)
176
177
                .rstrip("\r\n"))
177
 
    except OSError, e:
178
 
        if e.errno != ENOENT:
 
178
    except IOError, e:
 
179
        if e.errno != errno.ENOENT:
179
180
            raise e
180
181
 
181
182
    v = os.environ.get('EMAIL')