diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-07-20 14:26:47 +0530 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-07-20 11:43:27 +0000 |
| commit | 8086c2d6538da6c5469ab36b98623d48a3aa4111 (patch) | |
| tree | fa5e86c0a6f702a2d2f18a5e40b55466375db406 | |
| parent | efd76aec55ef79e16b76ab2f3779c1ff5b2dc8bf (diff) | |
Don't allow git commit to fail when initializing source tree
This is only needed by recipes that are buggy.
Fixes https://gitlab.freedesktop.org/gstreamer/cerbero/-/issues/25
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/559>
| -rw-r--r-- | cerbero/utils/git.py | 8 | ||||
| -rw-r--r-- | recipes/build-tools/intltool-m4.recipe | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/cerbero/utils/git.py b/cerbero/utils/git.py index fc80b8e8..47757485 100644 --- a/cerbero/utils/git.py +++ b/cerbero/utils/git.py @@ -270,12 +270,8 @@ def init_directory(git_dir, logfile=None): @type git_dir: str ''' init(git_dir, logfile=logfile) - try: - shell.new_call([GIT, 'add', '--force', '-A', '.'], git_dir, logfile=logfile) - shell.call('%s commit -m "Initial commit" > /dev/null 2>&1' % GIT, - git_dir, logfile=logfile) - except: - pass + shell.new_call([GIT, 'add', '--force', '-A', '.'], git_dir, logfile=logfile) + shell.new_call([GIT, 'commit', '-m', 'Initial commit'], git_dir, logfile=logfile) def apply_patch(patch, git_dir, logfile=None): diff --git a/recipes/build-tools/intltool-m4.recipe b/recipes/build-tools/intltool-m4.recipe index f24ff3f4..d8873cab 100644 --- a/recipes/build-tools/intltool-m4.recipe +++ b/recipes/build-tools/intltool-m4.recipe @@ -9,9 +9,10 @@ class Recipe(recipe.Recipe): btype = BuildType.CUSTOM url = 'https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz' tarball_checksum = '67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd' + tarball_dirname = 'intltool-%(version)s' files_devel = ['share/aclocal/intltool.m4'] async def install(self): - m4 = os.path.join(self.build_dir.replace('-m4', ''), 'intltool.m4') + m4 = os.path.join(self.build_dir, 'intltool.m4') shutil.copy(m4, os.path.join(self.config.prefix, 'share', 'aclocal', 'intltool.m4')) |