summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiß <holger@zedat.fu-berlin.de>2011-07-05 23:54:46 +0200
committerHolger Weiß <holger@zedat.fu-berlin.de>2011-07-05 23:54:46 +0200
commitbeb1b5a34759bd3cc3f5c577b30bf880f30905a8 (patch)
treed362f894405680678dbb9936151b8a8909fcaa12
parent63bfad7896af8e463fe2278528fe1c9e2e87d623 (diff)
downloadbcfg2-beb1b5a34759bd3cc3f5c577b30bf880f30905a8.tar.gz
bcfg2-beb1b5a34759bd3cc3f5c577b30bf880f30905a8.tar.bz2
bcfg2-beb1b5a34759bd3cc3f5c577b30bf880f30905a8.zip
bcfg2-admin compare -r: Clean up the output
Fix the messages which are spit out when the "-r" flag is used.
-rw-r--r--src/lib/Server/Admin/Compare.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Server/Admin/Compare.py b/src/lib/Server/Admin/Compare.py
index 575da71f5..27e1478d1 100644
--- a/src/lib/Server/Admin/Compare.py
+++ b/src/lib/Server/Admin/Compare.py
@@ -125,15 +125,15 @@ class Compare(Bcfg2.Server.Admin.Mode):
(oldd, newd) = args
(old, new) = [os.listdir(spot) for spot in args]
for item in old:
- print("Entry:", item)
+ print("File: %s" % item)
state = self.__call__([oldd + '/' + item, newd + '/' + item])
new.remove(item)
if state:
- print("Entry:", item, "good")
+ print("File %s is good" % item)
else:
- print("Entry:", item, "bad")
+ print("File %s is bad" % item)
if new:
- print("new has extra entries", new)
+ print("%s has extra files: %s" % (newd, ', '.join(new)))
return
try:
(old, new) = args