From a453d9d2aae064e9a642ba5a825347958760302f Mon Sep 17 00:00:00 2001 From: Gogs Date: Wed, 6 Sep 2017 08:26:02 +0000 Subject: [PATCH] CO - Bug fix with empty records (not allowed) --- src/utils/agents/actor.py | 8 +++++--- src/utils/agents/manager.py | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/utils/agents/actor.py b/src/utils/agents/actor.py index 78db4aa..36ecfa6 100644 --- a/src/utils/agents/actor.py +++ b/src/utils/agents/actor.py @@ -194,8 +194,10 @@ class Folders(Actor): @pre : isValid """ folder = item['label'] - signature='-'.join([str(item['date']),str(item['count']),'-files']) - tarball=os.sep([folder,signature]) + name = folder.split(os.sep) + name = name[len(name)-1] + signature='-'.join([name,str(item['date']),str(item['count']),'files']) + tarball=os.sep.join([folder,'..',signature]) shutil.make_archive(tarball,'tar',folder) self.clean(item) # @@ -212,7 +214,7 @@ class Folders(Actor): rpath = item['label'] files = os.listdir(item['label']) for name in list(files) : - path = os.sep([item['label'],name]) + path = os.sep.join([item['label'],name]) if os.path.isdir(path) : shutil.rmtree(path) else: diff --git a/src/utils/agents/manager.py b/src/utils/agents/manager.py index d46e400..5a4f6db 100644 --- a/src/utils/agents/manager.py +++ b/src/utils/agents/manager.py @@ -230,6 +230,8 @@ class Manager() : else: #label = id row = data + if type(row)==list and len(row) == 0 : + continue # #