From b8074549f6d1ed984771a988352a1c30c377bfc4 Mon Sep 17 00:00:00 2001 From: Gonzalo Odiard Date: Wed, 27 Nov 2013 14:55:31 -0300 Subject: [PATCH] Fix cloning activity in sugar - SL #4608 Probably this code was not included in the initial port from gtk2 to gtk3, because is only used by Sugar, but now we need it. I changed the way the parameter dist_name is used, then a complementary patch in sugar is needed Fixes #4608 Signed-off-by: Gonzalo Odiard --- src/sugar3/activity/bundlebuilder.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/sugar3/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py index 84b806bd..14ef7687 100644 --- a/src/sugar3/activity/bundlebuilder.py +++ b/src/sugar3/activity/bundlebuilder.py @@ -64,10 +64,11 @@ def list_files(base_dir, ignore_dirs=None, ignore_files=None): class Config(object): - def __init__(self, source_dir): + def __init__(self, source_dir, dist_dir=None, dist_name=None): self.source_dir = source_dir self.build_dir = os.getcwd() - self.dist_dir = os.path.join(self.build_dir, 'dist') + self.dist_dir = dist_dir or os.path.join(self.source_dir, 'dist') + self.dist_name = dist_name self.bundle = None self.version = None self.activity_name = None @@ -91,8 +92,12 @@ class Config(object): self.bundle_name = reduce(operator.add, self.activity_name.split()) self.bundle_root_dir = self.bundle_name + '.activity' self.tar_root_dir = '%s-%s' % (self.bundle_name, self.version) - self.xo_name = '%s-%s.xo' % (self.bundle_name, self.version) - self.tar_name = '%s-%s.tar.bz2' % (self.bundle_name, self.version) + if self.dist_name: + self.xo_name = '%s.xo' % self.dist_name + self.tar_name = '%s.tar.bz2' % self.dist_name + else: + self.xo_name = '%s-%s.xo' % (self.bundle_name, self.version) + self.tar_name = '%s-%s.tar.bz2' % (self.bundle_name, self.version) class Builder(object):