Merge "Replace use of os.errno.* with errno.*"
This commit is contained in:
commit
4b90b0d8d0
|
@ -38,6 +38,7 @@ Requires rootwrap (or equivalent sudo privileges) to execute:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import errno
|
||||||
import glob
|
import glob
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
|
@ -349,7 +350,7 @@ class DjbdnsBackend(base.AgentBackend):
|
||||||
os.remove(zone_fn)
|
os.remove(zone_fn)
|
||||||
LOG.debug('Deleted Zone: %s', zone_name)
|
LOG.debug('Deleted Zone: %s', zone_name)
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
if os.errno.ENOENT == e.errno:
|
if errno.ENOENT == e.errno:
|
||||||
LOG.info("Zone datafile %s was already deleted", zone_fn)
|
LOG.info("Zone datafile %s was already deleted", zone_fn)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,7 @@ Supported Knot versions: >= 2.1, < 3
|
||||||
Configured in [service:agent:gdnsd]
|
Configured in [service:agent:gdnsd]
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import errno
|
||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
import string
|
import string
|
||||||
|
@ -245,7 +246,7 @@ class GdnsdBackend(base.AgentBackend):
|
||||||
os.remove(zone_fn)
|
os.remove(zone_fn)
|
||||||
LOG.debug('Deleted Zone: %s', zone_name)
|
LOG.debug('Deleted Zone: %s', zone_name)
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
if os.errno.ENOENT == e.errno:
|
if errno.ENOENT == e.errno:
|
||||||
LOG.info("Zone datafile %s was already deleted", zone_fn)
|
LOG.info("Zone datafile %s was already deleted", zone_fn)
|
||||||
return
|
return
|
||||||
raise
|
raise
|
||||||
|
|
Loading…
Reference in New Issue