summaryrefslogtreecommitdiff
path: root/attoconf
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2015-10-01 00:22:11 -0700
committerBen Longbons <b.r.longbons@gmail.com>2015-10-01 00:22:11 -0700
commit50e08a90d5e9fec332603b11cc3ad7e03fe1552c (patch)
tree9292e7bc86ac655afe562b45f9a76a1da4de57a4 /attoconf
parent621af313a8dfe46df159766fbe158af5dd8cb6ad (diff)
downloadattobuild-50e08a90d5e9fec332603b11cc3ad7e03fe1552c.tar.gz
attobuild-50e08a90d5e9fec332603b11cc3ad7e03fe1552c.tar.bz2
attobuild-50e08a90d5e9fec332603b11cc3ad7e03fe1552c.tar.xz
attobuild-50e08a90d5e9fec332603b11cc3ad7e03fe1552c.zip
Fix legacy compatibility again
Diffstat (limited to 'attoconf')
-rw-r--r--attoconf/classy.py4
-rw-r--r--attoconf/lib/install.py4
2 files changed, 7 insertions, 1 deletions
diff --git a/attoconf/classy.py b/attoconf/classy.py
index ba06fcc..59a62e1 100644
--- a/attoconf/classy.py
+++ b/attoconf/classy.py
@@ -38,7 +38,9 @@ class PolymorphicSlotMergerMetaclass(type):
# TODO: remove *args for 1.0
def __call__(cls, *args, **kwargs):
instance = type.__call__(cls, *args, **kwargs)
- instance._do_jiggle()
+ if 'package' in kwargs or not isinstance(instance,
+ __import__('attoconf.lib.install', fromlist=['Install']).Install):
+ instance._do_jiggle()
return instance
diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py
index 3dc7f5b..26e515c 100644
--- a/attoconf/lib/install.py
+++ b/attoconf/lib/install.py
@@ -152,8 +152,12 @@ class Install(ClassyProject):
self.set_package(package, package_name)
def set_package(self, package, package_name):
+ if package is not None:
+ assert self.package is None
self.package = package
self.package_name = package_name
+ if package is not None:
+ self._do_jiggle()
def general(self):
super(Install, self).general()