Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(templates): fix toolchain symlinking #60

Merged
merged 2 commits into from
Jan 11, 2018
Merged

fix(templates): fix toolchain symlinking #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a7c9e0
fix(templates): fix toolchain symlinking
larsbutler Dec 21, 2017
0599f65
style(build_deps): fix flake8 issues
larsbutler Dec 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions yoke/build_deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def wait_for_container_to_finish(container):
def remove_container(container):
try:
container.remove()
except:
except Exception:
# We just log an error and swallow the exception, because this happens
# often on CircleCI.
LOG.error(
Expand Down Expand Up @@ -150,7 +150,7 @@ def build(self):
try:
# Allow connecting to older Docker versions (e.g. CircleCI 1.0)
client = docker.from_env(version='auto')
except:
except Exception:
LOG.error("Docker is not running, or it's outdated.")
raise

Expand Down
7 changes: 6 additions & 1 deletion yoke/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,12 @@

# Symlink all the existing autoconf macros into the installed tool's directory
for MACRO in `ls /usr/share/aclocal`; do
ln -s /usr/share/aclocal/${MACRO} /usr/local/share/aclocal/${MACRO}
# If the file already exists, don't try to symlink it:
if [[ ! -f /usr/local/share/aclocal/${MACRO} ]]; then
ln -s /usr/share/aclocal/${MACRO} /usr/local/share/aclocal/${MACRO}
else
echo "/usr/local/share/aclocal/${MACRO} already exists! Skipping symlink."
fi
done

# Build source libxml2 and libxslt RPMs
Expand Down