From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 9 Jan 2014 11:46:05 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myplc
X-Git-Tag: myplc-5.3-2~1
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=126d9e887b298b07f4446196507bedb8d8c4da5d;hp=3bc4ba74a32c86ea10e6c4a2d1a5709f6178e3bb

Merge branch 'master' of ssh://git.onelab.eu/git/myplc
---

diff --git a/bin/check-hrns.py b/bin/check-hrns.py
index 1ca6cdf..e5ac4dc 100755
--- a/bin/check-hrns.py
+++ b/bin/check-hrns.py
@@ -17,7 +17,8 @@ def handle_nodes (sites,sites_by_id, dry_run, verbose):
             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:
@@ -38,7 +39,8 @@ def handle_persons (sites,sites_by_id, dry_run,verbose):
 
             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:
@@ -55,7 +57,8 @@ def handle_slices (sites,sites_by_id, dry_run,verbose):
             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:
@@ -66,7 +69,8 @@ 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: