From 56cfff906886f81d759fbbc939fc13ed976ad526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 May 2010 18:22:20 +0200 Subject: [PATCH] do not die on helper directories --- osc/core.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/osc/core.py b/osc/core.py index 4152bbb6..4539902f 100644 --- a/osc/core.py +++ b/osc/core.py @@ -908,11 +908,15 @@ class Package: pathn = getTransActPath(self.dir) if validators: + import subprocess + from stat import * for validator in os.listdir(validators): - import subprocess - p = subprocess.Popen([validators+"/"+validator], close_fds=True) - if p.wait() != 0: - raise oscerr.RuntimeError(p.stdout, validator ) + fn=validators+"/"+validator + mode = os.stat(fn) + if S_ISREG(mode[ST_MODE]): + p = subprocess.Popen([fn], close_fds=True) + if p.wait() != 0: + raise oscerr.RuntimeError(p.stdout, validator ) have_conflicts = False for filename in self.todo: