Merge pull request #43 from pigay/fix-irepl-check-date

fix grace period bug and version number
mesocentre-mcia · Mar 13, 2017 · dc1442c · dc1442c
2 parents dab848d + efb0374
commit dc1442c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/mcia_irods_utils/replicas.py b/mcia_irods_utils/replicas.py
@@ -38,7 +38,7 @@ def replica_dict_with_date( output ):
 
             if pr is None: continue
 
-            path, replnum, date = pr
+            path, replnum, dataid, date = pr
 
             if path not in ret: ret[path] = [replnum, dataid, date]
             else:

diff --git a/scripts/irepl-check b/scripts/irepl-check
@@ -393,9 +393,9 @@ def do_irepl_check( collection, condition, user, recursive, verbose, resource,
     if date:
         grace_failed = []
         for f in failed:
-            d = datetime.datetime.fromtimestamp( f[1][1] )
+            d = datetime.datetime.fromtimestamp( f[1][2] )
             if d < grace_date:
-                grace_failed.append( ( f[0], f[1][0] ) )
+                grace_failed.append( ( f[0], f[1] ) )
         failed = grace_failed
 
     for f in failed:

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 scripts = glob.glob( "scripts/i*" )
 
 setup( name = 'mcia-irods-utils',
-       version = '0.7.-',
+       version = '0.7.7',
        description = 'MCIA\'s iCommands utilities',
        author = 'Pierre Gay',
        author_email = 'pierre.gay@u-bordeaux.fr',