fix install stage in specfile

[myplc.git] / bin / check-hrns.py

diff --git a/bin/check-hrns.py b/bin/check-hrns.py
index 8febdee..cd1295f 100755 (executable)
--- a/bin/check-hrns.py
+++ b/bin/check-hrns.py
@@ -14,14 +14,15 @@ def handle_nodes (sites,sites_by_id, dry_run, verbose):
         login_base=site['login_base']
         for node_id in site.get('node_ids', []):
             try:    node=nodes_by_id[node_id]
-            except: print 'cannot find node %s'%node_id; continue
+            except: print('cannot find node %s'%node_id); continue
             hrn=hostname_to_hrn (toplevel, login_base, node['hostname'])
             if node['hrn'] != hrn:
-                print "Node %s - current hrn %s, should be %s"%(node['hostname'], node['hrn'], hrn)
+                if verbose:
+                    print("Node %s - current hrn %s, should be %s"%(node['hostname'], node['hrn'], hrn))
                 if dry_run: continue
                 SetNodeHrn (node['node_id'],hrn)
             else:
-                if verbose: print "Node %s OK"%node['hostname']
+                if verbose: print("Node %s OK"%node['hostname'])
 
 def handle_persons (sites,sites_by_id, dry_run,verbose): 
     persons=GetPersons ({'peer_id':None},['person_id','email','hrn','site_ids'])
@@ -30,19 +31,20 @@ def handle_persons (sites,sites_by_id, dry_run,verbose):
         login_base=site['login_base']
         for person_id in site.get('person_ids', []):
             try:    person=persons_by_id[person_id]
-            except: print 'cannot find person %s'%person_id; continue
+            except: print('cannot find person %s'%person_id); continue
             how_many=len(person['site_ids'])
             if how_many !=1:
-                if verbose: print "Checking persons in exactly one site -- person %s in %s site(s) -- ignored"%(person['email'],how_many)
+                if verbose: print("Checking persons in exactly one site -- person %s in %s site(s) -- ignored"%(person['email'],how_many))
                 continue
 
             hrn=email_to_hrn ("%s.%s"%(toplevel,login_base),person['email'])
             if person['hrn'] != hrn:
-                print "Person %s - current hrn %s, should be %s"%(person['email'], person['hrn'], hrn)
+                if verbose:
+                    print("Person %s - current hrn %s, should be %s"%(person['email'], person['hrn'], hrn))
                 if dry_run: continue
                 SetPersonHrn (person['person_id'],hrn)
             else:
-                if verbose: print "Person %s OK"%person['email']
+                if verbose: print("Person %s OK"%person['email'])
 
 
 def handle_slices (sites,sites_by_id, dry_run,verbose):
@@ -52,25 +54,27 @@ def handle_slices (sites,sites_by_id, dry_run,verbose):
         login_base=site['login_base']
         for slice_id in site.get('slice_ids', []):
             try:    slice=slices_by_id[slice_id]
-            except: print 'cannot find slice %s'%slice_id; continue
+            except: print('cannot find slice %s'%slice_id); continue
             hrn=slicename_to_hrn (toplevel, slice['name'])
             if slice['hrn'] != hrn:
-                print "Slice %s - current hrn %s, should be %s"%(slice['name'], slice['hrn'], hrn)
+                if verbose:  
+                    print("Slice %s - current hrn %s, should be %s"%(slice['name'], slice['hrn'], hrn))
                 if dry_run: continue
                 SetSliceHrn (slice['slice_id'],hrn)
             else:
-                if verbose: print "Slice %s OK"%slice['name']
+                if verbose: print("Slice %s OK"%slice['name'])
 
 
 def handle_sites (sites,sites_by_id, dry_run,verbose):
     for site in sites:
         hrn='.'.join([toplevel, site['login_base']])
         if site['hrn'] != hrn:
-            print "Site %s - current hrn %s, should be %s"%(site['name'], site['hrn'], hrn)
+            if verbose:
+                print("Site %s - current hrn %s, should be %s"%(site['name'].encode('ascii', 'ignore'), site['hrn'], hrn))
             if dry_run: continue
             SetSiteHrn (site['site_id'],hrn)
         else:
-            if verbose: print "Site %s OK"%site['name']
+            if verbose: print("Site %s OK"%site['name'])
         
 
             
@@ -108,9 +112,9 @@ Example:
     dry_run=options.show
     verbose=options.verbose
     # optimizing : we compute the set of sites only once
-    sites = GetSites({'peer_id':None},['site_id','login_base','node_ids','person_ids','name','hrn','slice_ids'])
+    sites = GetSites({'peer_id':None},['site_id','login_base','node_ids','person_ids','name','hrn','slice_ids', 'sfa_created'])
     # remove external sites created through SFA
-    sites = [site for site in sites if not site['name'].startswith('sfa:')]
+    sites = [site for site in sites if site['sfa_created'] != 'True']
     sites_by_id = dict ( [ (site['site_id'], site) for site in sites ] )
 
     if options.nodes: handle_nodes(sites,sites_by_id,dry_run,verbose)