summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-27 23:57:53 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-27 23:57:53 +0100
commitbcf0d9b190e846e18a67e9098213ec6c3d90d7f0 (patch)
treeb4ce1ef1613edb44b97735fb012a730abd31713f
parent8ed37d818f74154da3017809d275671d6a6d16bb (diff)
Another raspbian fix.
-rwxr-xr-xcdist7
1 files changed, 5 insertions, 2 deletions
diff --git a/cdist b/cdist
index 0c61827..0f19d0c 100755
--- a/cdist
+++ b/cdist
@@ -412,7 +412,10 @@ class LinuxTarget(Target):
self.version = version
self.bits = bits
# e.g. ubuntu-14.04-64
- self.chroot = '%s-%s-%d' % (self.distro, self.version, self.bits)
+ if self.version is not None and self.bits is not None:
+ self.chroot = '%s-%s-%d' % (self.distro, self.version, self.bits)
+ else:
+ self.chroot = self.distro
# e.g. /home/carl/Environments/ubuntu-14.04-64
self.chroot_prefix = '%s/%s' % (config.get('linux_chroot_prefix'), self.chroot)
@@ -522,7 +525,7 @@ def target_factory(s, debug, work):
sys.exit(1)
target = LinuxTarget(p[0], p[1], int(p[2]), work)
elif s == 'raspbian':
- target = LinuxTarget(s, '', 32, work)
+ target = LinuxTarget(s, None, None, work)
elif s.startswith('osx-'):
target = OSXSingleTarget(int(s.split('-')[1]), work)
elif s == 'osx':