Changeset 4361:be4f40f8388c in livinglogic.python.xist

Show
Ignore:
Timestamp:
03/01/11 16:32:00 (9 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

uls -l -r was printing filenames twice. Fix that.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • src/ll/scripts/uls.py

    r4283 r4361  
    6363        if s <= width or numcols == 1: 
    6464            return (rows, cols) 
    65         numcols -=1 
     65        numcols -= 1 
    6666 
    6767 
     
    144144            else: 
    145145                for child in url.listdir(): 
    146                     printone(url/child, long, human) 
     146                    child = url/child 
     147                    if not recursive or child.isdir(): # For files the print call is done by the recursive call to ``printall`` 
     148                        printone(child, long, human) 
    147149                    if recursive: 
    148                         printall(base, url/child, one, long, recursive, human, spacing) 
     150                        printall(base, child, one, long, recursive, human, spacing) 
    149151        else: 
    150152            printone(url, long, human)