diff --git a/tren.py b/tren.py index d2c0452..e9c3798 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.147 2010/02/05 21:13:07 tundra Exp $" +RCSID = "$Id: tren.py,v 1.148 2010/02/05 21:22:44 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -180,7 +180,8 @@ # Informational Messages ##### -iSKIPPING = "Skipping renaming of '%s' - Newname '%s' Exists!" +iRENEXISTING = "Forced rename existing '%s' to '%s' !" +iSKIPPING = "Skipping '%s' - Newname '%s' Exists!" ##### @@ -532,13 +533,15 @@ if ProgramOptions[FORCERENAM]: renameexisting = newname + ProgramOptions[EXISTSUFFIX] - InfoMsg(ColumnPad([newname + " %s " % ARROW, renameexisting]), TESTMODE) + InfoMsg(iRENEXISTING % (newname, renameexisting), TESTMODE) else: InfoMsg(iSKIPPING % (target, newname), TESTMODE) - InfoMsg(ColumnPad([target + " %s " % ARROW, newname]), TESTMODE) + else: + + InfoMsg(ColumnPad([target + " %s " % ARROW, newname]), TESTMODE) # Actually do the renaming else: