On 13.4.2011 15:21, Jan Cholasta wrote:
On 13.4.2011 13:04, Martin Kosek wrote:
On Mon, 2011-04-11 at 15:07 +0200, Jan Cholasta wrote:
Fixed unitialized attributes in ipalib.aci.ACI, ipalib.parameters.Data,
ipalib.text.LazyText, ipaserver.install.service.Service and
ipaserver.rpcserver.WSGIExecutioner.
NACK. This patch breaks the build.
$ make rpms
[snip]
if [ "" != "yes" ]; then \
./makeapi --validate; \
fi
Traceback (most recent call last):
File "./makeapi", line 281, in<module>
sys.exit(main())
File "./makeapi", line 259, in main
api.finalize()
File "/home/mkosek/freeipa/ipalib/plugable.py", line 574, in finalize
self.__do_if_not_done('load_plugins')
File "/home/mkosek/freeipa/ipalib/plugable.py", line 384, in
__do_if_not_done
getattr(self, name)()
File "/home/mkosek/freeipa/ipalib/plugable.py", line 526, in
load_plugins
self.import_plugins('ipalib')
File "/home/mkosek/freeipa/ipalib/plugable.py", line 564, in
import_plugins
raise e
AttributeError: locked: cannot set Str.re to None
make: *** [version-update] Error 1
Fixed.
NACK, made a stupid mistake. Should be ok now.
Martin
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
--
Jan Cholasta
>From 5164686275af6bfa0d4fe0a3dec468c5529340d5 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jchol...@redhat.com>
Date: Thu, 14 Apr 2011 12:58:05 +0200
Subject: [PATCH] Fix unitialized attributes.
---
ipalib/aci.py | 2 ++
ipalib/parameters.py | 5 +++++
ipalib/text.py | 1 +
ipaserver/install/service.py | 4 ++++
ipaserver/rpcserver.py | 1 +
5 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ipalib/aci.py b/ipalib/aci.py
index abb2ebc..1b607a3 100755
--- a/ipalib/aci.py
+++ b/ipalib/aci.py
@@ -45,6 +45,8 @@ class ACI:
"""
def __init__(self,acistr=None):
self.name = None
+ self.source_group = None
+ self.dest_group = None
self.orig_acistr = acistr
self.target = {}
self.action = "allow"
diff --git a/ipalib/parameters.py b/ipalib/parameters.py
index ef62aab..446f05c 100644
--- a/ipalib/parameters.py
+++ b/ipalib/parameters.py
@@ -1127,6 +1127,11 @@ class Data(Param):
)
def __init__(self, name, *rules, **kw):
+ if not hasattr(self, 're'):
+ self.re = None
+ if not hasattr(self, 're_errmsg'):
+ self.re_errmsg = None
+
super(Data, self).__init__(name, *rules, **kw)
if not (
diff --git a/ipalib/text.py b/ipalib/text.py
index a910cc5..af532db 100644
--- a/ipalib/text.py
+++ b/ipalib/text.py
@@ -154,6 +154,7 @@ class LazyText(object):
self.domain = domain
self.localedir = localedir
self.key = (domain, localedir)
+ self.args = None
def __eq__(self, other):
"""
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 253c0f0..0b9bb01 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -113,6 +113,10 @@ class Service:
else:
self.sstore = sysrestore.StateFile('/var/lib/ipa/sysrestore')
+ self.realm = None
+ self.suffix = None
+ self.principal = None
+
def ldap_connect(self):
self.admin_conn = self.__get_conn(self.fqdn, self.dm_password)
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index 3d93abe..9c08bb8 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -178,6 +178,7 @@ class WSGIExecutioner(Executioner):
Base class for execution backends with a WSGI application interface.
"""
+ content_type = None
key = ''
def set_api(self, api):
--
1.7.4.2
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
