Changeset 1052

Timestamp:

Aug 15, 2012, 3:23:32 PM (12 years ago)

Author:

joergs

Message:

beautified

File:

• opsi/server/dass-opsi-tools/usr/bin/opsi-client.py (modified) (3 diffs)

opsi/server/dass-opsi-tools/usr/bin/opsi-client.py

@@ -44 +44 @@
             return False
         print src + ":"
+        host = self.rpc.host_getHashes( [], {"id":src} )[0]
+        print "  IP:", host["ipAddress"]
+        print "  MAC:", host["hardwareAddress"]
+        print "  inventory:", host["inventoryNumber"]
+        print "  last seen:", host["lastSeen"]
+        print "  notes:", host["notes"]
+        
+        print "  products:"
         products = self.getProductOnClient( src, [] )
         for i in products:
-            print i['productId'] + ": (", i['actionRequest'], i['actionProgress'], ")", i['installationStatus']
-            pprint( i, indent=4 )
+            print "    " + i['productId'] + ":"
+            print "      " + i['installationStatus'], "(",
+            if i['actionRequest']:
+                print i['actionRequest'],
+                if i['actionProgress']:
+                    print i['actionProgress'],
+            print ")"
+            print "      ",
+            pprint( i, indent=8 )
         return True
 
@@ -77 +92 @@
         #  opsiCallClientBaculaProperties=[ "method", "getProductProperties_hash", "bacula" ]
         print "done"
+        return True
 
         
@@ -146 +162 @@
         result = opsi.clean( args.src )
     elif args.subcommand == "copy": 
-        opsi.copyClient( args.src, args.dst, args.ip, args.mac, args.depot )
+        result = opsi.copyClient( args.src, args.dst, args.ip, args.mac, args.depot )
     else:
         print "not yet implemented"