Commit 00db05ae authored by Andreas Jung's avatar Andreas Jung

- FTP server: replaced 'System_Process' by 'Sysproc' to

        avoid breaking some FTP clients and the output format
        with overlong usernames.
parent 799dd03b
# -*- Mode: Python; tab-width: 4 -*- # -*- Mode: Python; tab-width: 4 -*-
# $Id: filesys.py,v 1.10 2002/02/15 18:41:43 andreasjung Exp $ # $Id: filesys.py,v 1.11 2002/04/12 14:08:12 andreasjung Exp $
# Author: Sam Rushing <rushing@nightmare.com> # Author: Sam Rushing <rushing@nightmare.com>
# #
# Generic filesystem interface. # Generic filesystem interface.
...@@ -392,12 +392,17 @@ def unix_longify (file, stat_info): ...@@ -392,12 +392,17 @@ def unix_longify (file, stat_info):
else: else:
dirchar = '-' dirchar = '-'
date = ls_date (long(time.time()), stat_info[stat.ST_MTIME]) date = ls_date (long(time.time()), stat_info[stat.ST_MTIME])
user = str(stat_info[stat.ST_UID].replace(' ','_'))
group= str(stat_info[stat.ST_GID].replace(' ','_'))
if user=='System_Processes': user='Sysproc'
if group=='System_Processes': group='Sysproc'
return '%s%s %3d %-8s %-8s %8d %s %s' % ( return '%s%s %3d %-8s %-8s %8d %s %s' % (
dirchar, dirchar,
mode, mode,
stat_info[stat.ST_NLINK], stat_info[stat.ST_NLINK],
stat_info[stat.ST_UID].replace(' ','_'), user,
stat_info[stat.ST_GID].replace(' ','_'), group,
stat_info[stat.ST_SIZE], stat_info[stat.ST_SIZE],
date, date,
file file
......
...@@ -170,6 +170,10 @@ Zope Changes ...@@ -170,6 +170,10 @@ Zope Changes
- Collector #343: The ZCatalogs 'Indexes' view showed the - Collector #343: The ZCatalogs 'Indexes' view showed the
wrong number of indexed objects for FieldIndexes. wrong number of indexed objects for FieldIndexes.
- FTP server: replaced 'System_Process' by 'Sysproc' to
avoid breaking some FTP clients and the output format
with overlong usernames.
Zope 2.5.1 beta 1 Zope 2.5.1 beta 1
......
# -*- Mode: Python; tab-width: 4 -*- # -*- Mode: Python; tab-width: 4 -*-
# $Id: filesys.py,v 1.10 2002/02/15 18:41:43 andreasjung Exp $ # $Id: filesys.py,v 1.11 2002/04/12 14:08:12 andreasjung Exp $
# Author: Sam Rushing <rushing@nightmare.com> # Author: Sam Rushing <rushing@nightmare.com>
# #
# Generic filesystem interface. # Generic filesystem interface.
...@@ -392,12 +392,17 @@ def unix_longify (file, stat_info): ...@@ -392,12 +392,17 @@ def unix_longify (file, stat_info):
else: else:
dirchar = '-' dirchar = '-'
date = ls_date (long(time.time()), stat_info[stat.ST_MTIME]) date = ls_date (long(time.time()), stat_info[stat.ST_MTIME])
user = str(stat_info[stat.ST_UID].replace(' ','_'))
group= str(stat_info[stat.ST_GID].replace(' ','_'))
if user=='System_Processes': user='Sysproc'
if group=='System_Processes': group='Sysproc'
return '%s%s %3d %-8s %-8s %8d %s %s' % ( return '%s%s %3d %-8s %-8s %8d %s %s' % (
dirchar, dirchar,
mode, mode,
stat_info[stat.ST_NLINK], stat_info[stat.ST_NLINK],
stat_info[stat.ST_UID].replace(' ','_'), user,
stat_info[stat.ST_GID].replace(' ','_'), group,
stat_info[stat.ST_SIZE], stat_info[stat.ST_SIZE],
date, date,
file file
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment