Skip to content

Commit 8db5986

Browse files
committed
Fix #44: DNS zones check: object of type 'bool' has no len()
Also: - Switch to separate logging module pplogger - Add release script
1 parent 6a1cf52 commit 8db5986

File tree

7 files changed

+27
-76
lines changed

7 files changed

+27
-76
lines changed

checkipaconsistency/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
"""
2424

25-
VERSION = '2.7.1'
25+
VERSION = '2.7.2'

checkipaconsistency/freeipaserver.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,10 @@ def _count_dns_zones(self):
300300
'(|(objectClass=idnszone)(objectClass=idnsforwardzone))',
301301
scope=ldap.SCOPE_ONELEVEL
302302
)
303-
r = len(results)
303+
if not results and type(results) is not list:
304+
r = 0
305+
else:
306+
r = len(results)
304307
self._log.debug(r)
305308
return r
306309

checkipaconsistency/logger.py

Lines changed: 0 additions & 73 deletions
This file was deleted.

checkipaconsistency/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
except ImportError:
3535
import ConfigParser as configparser
3636

37+
from pplogger import get_logger
3738
from . import VERSION
38-
from .logger import get_logger
3939
from .freeipaserver import FreeIPAServer
4040

4141

release

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
if [[ "$@" == "test" ]]; then
6+
test="test"
7+
else
8+
test=""
9+
fi
10+
11+
for f in *.md; do
12+
pandoc -s -f gfm -t rst "$f" > "${f%.md}.rst"
13+
done
14+
15+
python setup.py "${test}release" || true
16+
17+
for f in *.md; do
18+
rm -f "${f%.md}.rst"
19+
done

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
pplogger>=2.0.0
12
dnspython>=1.15.0
23
prettytable>=0.7.2
34
pyldap>=2.4.45

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ classifiers =
2323
include_package_data = True
2424
packages = checkipaconsistency
2525
install_requires =
26+
pplogger>=2.0.0
2627
pyldap>=2.4.45
2728
prettytable>=0.7.2
2829
dnspython>=1.15.0

0 commit comments

Comments
 (0)