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

Improve error message logging on exit #592

Merged
merged 14 commits into from
Jun 29, 2016
Merged

Improve error message logging on exit #592

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f1e68eb
Used Leo Arias' suggestion to fix bug 1574190
tsimonq2 Jun 22, 2016
88eb353
Merge branch 'master' into bug1574190
tsimonq2 Jun 22, 2016
83ead7a
Merge branch 'master' into bug1574190
tsimonq2 Jun 23, 2016
8d3d21a
Made some tweaks that will hopefully fix the Travis tests
tsimonq2 Jun 23, 2016
e62d04a
Merge branch 'bug1574190' of github.com:tsimonq2/snapcraft into bug15…
tsimonq2 Jun 23, 2016
0119f6e
Merge branch 'master' into bug1574190
tsimonq2 Jun 23, 2016
5b010f1
Changed the wording of the change in main.py
tsimonq2 Jun 23, 2016
99cb4f0
Merge branch 'bug1574190' of github.com:tsimonq2/snapcraft into bug15…
tsimonq2 Jun 23, 2016
c778fbc
Merge branch 'master' into bug1574190
tsimonq2 Jun 28, 2016
d910924
Added blank line where needed, removed uncalled subprocess import
tsimonq2 Jun 28, 2016
5cfcc23
Fixed the test_no_lxd and test_topic_and_plugin_not_found_exits_with_tip
tsimonq2 Jun 28, 2016
99746bf
Fixed test_error_with_unexistent_build_package (test_snap.SnapTestCas…
tsimonq2 Jun 28, 2016
975a732
Corrected unneeded line break in test_stage.StageTestCase.test_conflicts
tsimonq2 Jun 28, 2016
cf96bb1
Fixes the build fail on test_stage.StageTestCase.test_conflicts
tsimonq2 Jun 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions snapcraft/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
import shutil
import sys
import subprocess
import textwrap

from docopt import docopt

Expand Down Expand Up @@ -209,9 +208,7 @@ def main(argv=None):
except Exception as e:
if args['--debug']:
raise

logger.error(textwrap.fill(str(e)))
sys.exit(1)
sys.exit(e)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bad merge. I changed these lines after you made your branch.
The correct merged statements would be:
logger.error(str(e))
sys.exit(1)



def _get_lifecycle_command(args):
Expand Down
8 changes: 4 additions & 4 deletions snapcraft/tests/test_commands_cleanbuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def test_no_lxd(self, mock_installed):
self.assertEqual(
fake_logger.output,
'The lxd package is not installed, in order to use `cleanbuild` '
'you\nmust install lxd onto your system. Refer to the '
'"Ubuntu Desktop and\nUbuntu Server" section on '
'https://linuxcontainers.org/lxd/getting-\nstarted-cli/'
'#ubuntu-desktop-and-ubuntu-server to enable a proper\nsetup.\n')
'you must install lxd onto your system. Refer to the '
'"Ubuntu Desktop and Ubuntu Server" section on '
'https://linuxcontainers.org/lxd/getting-started-cli/'
'#ubuntu-desktop-and-ubuntu-server to enable a proper setup.')