diff --git a/tren.py b/tren.py index dde703b..9c9a20b 100755 --- a/tren.py +++ b/tren.py @@ -8,7 +8,7 @@ PROGNAME = "tren.py" BASENAME = PROGNAME.split(".py")[0] PROGENV = BASENAME.upper() -RCSID = "$Id: tren.py,v 1.180 2010/03/10 00:50:14 tundra Exp $" +RCSID = "$Id: tren.py,v 1.181 2010/03/10 01:02:07 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -126,12 +126,12 @@ TOKFILCMD = "CMDLINE" TOKFILCTIME = "CTIME" TOKFILDEV = "DEV" +TOKFILFNAME = "FNAME" TOKFILGID = "GID" TOKFILGRP = "GNAME" TOKFILINODE = "INODE" TOKFILMODE = "MODE" TOKFILMTIME = "MTIME" -TOKFILNAM = "FNAME" TOKFILNLINK = "NLINK" TOKFILSIZE = "SIZE" TOKFILUID = "UID" @@ -856,6 +856,9 @@ if r[2] == TOKFILDEV: r[2] = str(self.RenNames[target][STATS][ST_DEV]) + elif r[2] == TOKFILFNAME: + r[2] = os.path.basename(target) + elif r[2] == TOKFILGID: r[2] = str(self.RenNames[target][STATS][ST_GID]) @@ -868,9 +871,6 @@ elif r[2] == TOKFILMODE: r[2] = str(self.RenNames[target][STATS][ST_MODE]) - elif r[2] == TOKFILNAM: - r[2] = os.path.basename(target) - elif r[2] == TOKFILNLINK: r[2] = str(self.RenNames[target][STATS][ST_NLINK])