From 0433bd89b56873f9e2b8ef05e60ff854869364ae Mon Sep 17 00:00:00 2001 From: jean-roch Date: Thu, 18 Jun 2020 12:47:08 +0200 Subject: [PATCH 1/4] 0 instead of None --- RucioClient.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RucioClient.py b/RucioClient.py index 3f014a22a..e6821ace5 100755 --- a/RucioClient.py +++ b/RucioClient.py @@ -75,6 +75,8 @@ def getFileCountBlock(self, block): """ try: numFiles = self.get_metadata(self.scope, block)['length'] + if numFiles is None: + raise Exception("block length in rucio is None") except Exception as e: print(str(e)) return 0 From bf5dc7a6d8bd4597dcda0b76723292d189ff755e Mon Sep 17 00:00:00 2001 From: jean-roch Date: Thu, 18 Jun 2020 12:47:26 +0200 Subject: [PATCH 2/4] list instead of 0 --- RucioClient.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RucioClient.py b/RucioClient.py index e6821ace5..517c15c79 100755 --- a/RucioClient.py +++ b/RucioClient.py @@ -93,6 +93,6 @@ def getFileCountPerBlock(self, dataset): blocks.append((block, self.getFileCountBlock(block))) except Exception as e: print(str(e)) - return 0 + return [] return blocks From 4afceab87838c9ca319153eac24015470093d327 Mon Sep 17 00:00:00 2001 From: sharad1126 Date: Fri, 19 Jun 2020 10:36:32 +0200 Subject: [PATCH 3/4] return 0 for instead of None --- RucioClient.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RucioClient.py b/RucioClient.py index 517c15c79..eea13571f 100755 --- a/RucioClient.py +++ b/RucioClient.py @@ -91,8 +91,10 @@ def getFileCountPerBlock(self, dataset): blocks = [] for block in self.getBlockNamesDataset(dataset): blocks.append((block, self.getFileCountBlock(block))) + if blocks is None: + raise Exception("number of file count per block is None") except Exception as e: print(str(e)) - return [] + return 0 return blocks From 865fee1eea09789740dadc7f348cc1f830a8241e Mon Sep 17 00:00:00 2001 From: GitHub Revert Action Date: Fri, 19 Jun 2020 09:39:15 +0000 Subject: [PATCH 4/4] Revert "return 0 for instead of None" This reverts commit 4afceab87838c9ca319153eac24015470093d327. --- RucioClient.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/RucioClient.py b/RucioClient.py index eea13571f..517c15c79 100755 --- a/RucioClient.py +++ b/RucioClient.py @@ -91,10 +91,8 @@ def getFileCountPerBlock(self, dataset): blocks = [] for block in self.getBlockNamesDataset(dataset): blocks.append((block, self.getFileCountBlock(block))) - if blocks is None: - raise Exception("number of file count per block is None") except Exception as e: print(str(e)) - return 0 + return [] return blocks