Skip to content

Commit

Permalink
Fixed installer bug: https://trello.com/c/5RcOfd3H
Browse files Browse the repository at this point in the history
Installer tried to always remove a file which was only created
when doing a remote install. This was harmless, but caused a
message, and since it did it with sudo, didn't work in the test environment.
  • Loading branch information
Alan-R committed Nov 26, 2015
1 parent 93adf71 commit 3b64e84
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 3 additions & 1 deletion buildtools/installme
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ PRERELURL=$ROOTURL/Prereleases
SRCROOT=https://github.com/assimilation/assimilation-official/raw
NEOVERS=2.2.5
BUILDLOG=build.out
TARBALL=''

DEBIAN_BASE_CMA_PKGS='python-pip python-flask lsof python-netaddr
resource-agents
Expand Down Expand Up @@ -1308,7 +1309,7 @@ fi

TMPDIR=$(mktmpdir)
cd $TMPDIR
trap 'cd /; rm -fr ${TMPDIR}; $LOCALSUDO rm -f ${TARBALL}' 0
trap 'cd /; rm -fr ${TMPDIR}' 0
case $1 in
cma|nanoprobe)
echo "Installing release $REL of Assimilation $1 on $(uname -n)"
Expand All @@ -1318,6 +1319,7 @@ case $1 in
test $LOGME = false || loginstall $1
;;
remote)
trap 'cd /; rm -fr ${TMPDIR}; $LOCALSUDO rm -f ${TARBALL}' 0
shift
printf 'Performing remote installation of %s on: [%s]\n' "$REL" "$*"
remote_nano_install "$@"
Expand Down
1 change: 1 addition & 0 deletions docfiles/Releases.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@subsection BugFixes_1_1_1 Bug Fixes
- Fixed notification API filter code - https://trello.com/c/RFpMIIhP
- Fixed switch discovery - https://trello.com/c/ZJacf7EI
- Fixed installer to not remove file that doesn't exist - https://trello.com/c/5RcOfd3H
@subsection Caveats_1_1_1 Caveats
- Not compatible with database formats before 1.1.0
- Sudoers discovery is disabled for this release - will reappear later on
Expand Down

0 comments on commit 3b64e84

Please sign in to comment.