From efb03740b06439c4cb2445854e48de542efebaf2 Mon Sep 17 00:00:00 2001 From: Pierre Gay Date: Mon, 13 Mar 2017 10:14:47 +0100 Subject: [PATCH] fix grace period bug and version number --- mcia_irods_utils/replicas.py | 2 +- scripts/irepl-check | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mcia_irods_utils/replicas.py b/mcia_irods_utils/replicas.py index 03128ec..bcd781b 100644 --- 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 index 1f4395d..c9d2b40 100755 --- 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 index 69ebf3a..aa9686f 100644 --- 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',