From 03575af39bc84f09097862cc6bd91862a825dc55 Mon Sep 17 00:00:00 2001 From: Michael Murtaugh Date: Thu, 5 Mar 2015 16:26:51 +0100 Subject: [PATCH] outputpath again --- etherdump | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etherdump b/etherdump index 2b2157f..23ab29f 100755 --- a/etherdump +++ b/etherdump @@ -370,11 +370,12 @@ if __name__ == "__main__": return info def get_pads(groupinfo=None): - pads = padids_from_path(args.pubpath) + pads = padids_from_path(os.path.join(args.outputpath, args.pubpath)) pads = [augment_info(x, groupinfo) for x in pads] # print (("padids_from_path", args.pubpath, pads), file=sys.stderr) - if not args.exclude_groups and os.path.exists(args.grouppath): - groups = [os.path.join(args.grouppath, x) for x in os.listdir(args.grouppath)] + gp = os.path.join(args.outputpath, args.grouppath) + if not args.exclude_groups and gp: + groups = [os.path.join(gp, x) for x in os.listdir(gp)] groups = [x for x in groups if os.path.isdir(x)] groups.sort() for gp in groups: