From 9bbbd83ee0b11f64cab25a7c1cce5ce8ee6b5cb3 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 11 Jul 2012 16:09:05 +0200 Subject: [PATCH] show warning message when deleting an expired credential also pass right logger to SfaClientBootstrap so the msg shows up --- sfa/client/sfaclientlib.py | 1 + sfa/client/sfi.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sfa/client/sfaclientlib.py b/sfa/client/sfaclientlib.py index 2d389219..521a220b 100644 --- a/sfa/client/sfaclientlib.py +++ b/sfa/client/sfaclientlib.py @@ -295,6 +295,7 @@ class SfaClientBootstrap: return filename else: # remove invalid file + self.logger.warning ("Removing %s - has expired"%filename) os.unlink(filename) try: produce_method (self, filename, *args, **kw) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 9fc372e0..8fa380b2 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -608,7 +608,8 @@ class Sfi: # init self-signed cert, user credentials and gid def bootstrap (self): - client_bootstrap = SfaClientBootstrap (self.user, self.reg_url, self.options.sfi_dir) + client_bootstrap = SfaClientBootstrap (self.user, self.reg_url, self.options.sfi_dir, + logger=self.logger) # if -k is provided, use this to initialize private key if self.options.user_private_key: client_bootstrap.init_private_key_if_missing (self.options.user_private_key) -- 2.43.0