From df67ee9147dd834f29d6daba85afc8969bd49cd9 Mon Sep 17 00:00:00 2001 From: Stuart Gathman Date: Mon, 25 Aug 2008 22:00:46 +0000 Subject: [PATCH] Report failure to remove milter socket --- Milter/__init__.py | 6 ++++-- pymilter.spec | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Milter/__init__.py b/Milter/__init__.py index f8e35ee..8d7b738 100755 --- a/Milter/__init__.py +++ b/Milter/__init__.py @@ -184,8 +184,10 @@ def runmilter(name,socketname,timeout = 0): print "Removing %s" % fname try: os.unlink(fname) - except: - pass + except os.error, x: + import errno + if x.errno != errno.ENOENT: + raise milter.error(x) # The default flags set include everything # milter.set_flags(milter.ADDHDRS) diff --git a/pymilter.spec b/pymilter.spec index 0620a05..d2f8967 100644 --- a/pymilter.spec +++ b/pymilter.spec @@ -270,7 +270,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Aug 25 2008 Stuart Gathman 0.8.10-2 -- /var/run/milter directory owned by mail +- /var/run/milter directory must be owned by mail * Mon Aug 25 2008 Stuart Gathman 0.8.10-1 - log rcpt for SRS rejections - improved parsing into email and fullname (still 2 self test failures)