[Zope-Checkins] CVS: Zope/ZServer/medusa - filesys.py:1.9.90.2

[Andreas Jung]

Update of /cvs-repository/Zope/ZServer/medusa
In directory cvs.zope.org:/tmp/cvs-serv19641/ZServer/medusa

Modified Files:
      Tag: Zope-2_5-branch
	filesys.py 
Log Message:

      - FTP server: replaced 'System_Process' by 'Sysproc' to 
        avoid breaking some FTP clients and the output format
        with overlong usernames.


=== Zope/ZServer/medusa/filesys.py 1.9.90.1 => 1.9.90.2 ===
         dirchar = '-'
     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' % (
             dirchar,
             mode,
             stat_info[stat.ST_NLINK],
+<<<<<<< filesys.py
             stat_info[stat.ST_UID].replace(' ','_'),
             stat_info[stat.ST_GID].replace(' ','_'),
+=======
+            user,
+            group,
+>>>>>>> 1.11
             stat_info[stat.ST_SIZE],
             date,
             file