← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-18 20:42:38 UTC
  • mfrom: (2625 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2643.
  • Revision ID: john@arbash-meinel.com-20070718204238-5gi11fx04q7zt72d
[merge] bzr.dev 2625

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/win32utils.py
169
169
    # at least return windows root directory
170
170
    windir = os.environ.get('windir')
171
171
    if windir:
172
 
        return os.path.splitdrive(windir) + '/'
 
172
        return os.path.splitdrive(windir)[0] + '/'
173
173
    # otherwise C:\ is good enough for 98% users
174
174
    return 'C:/'
175
175
 
240
240
    return _ensure_unicode(get_host_name())
241
241
 
242
242
 
243
 
def glob_expand_for_win32(file_list):
 
243
def glob_expand(file_list):
244
244
    """Replacement for glob expansion by the shell.
245
245
 
246
246
    Win32's cmd.exe does not do glob expansion (eg ``*.py``), so we do our own