Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

cleanup gen_package.py #13089

Merged
dnfield merged 7 commits into from
Oct 11, 2019
Merged

cleanup gen_package.py #13089

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b3a8e3
cleanup
dnfield Oct 11, 2019
bf06e4f
do not store unused var
dnfield Oct 11, 2019
1103757
assertion
dnfield Oct 11, 2019
4dab559
print manifest contents
dnfield Oct 11, 2019
91963ca
stray paren
dnfield Oct 11, 2019
a1424f6
stray period
dnfield Oct 11, 2019
2315ef0
...
dnfield Oct 11, 2019
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
Next Next commit
cleanup
  • Loading branch information
@dnfield
dnfield committed Oct 11, 2019
commit 6b3a8e3688c85dfa5afe7e581bdb9439d9007a84
16 changes: 4 additions & 12 deletions tools/fuchsia/gen_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,12 @@ def main():
]

# Build the package
try:
output = subprocess.check_output(pm_command_base + ['build'])
except subprocess.CalledProcessError as e:
print('The "%s" command failed:' % e.cmd)
print(e.output)
raise
# Use check_output so if anything goes wrong we get the output.
output = subprocess.check_output(pm_command_base + ['build'])
Copy link
Contributor

@iskakaushik iskakaushik Oct 11, 2019

Choose a reason for hiding this comment

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

do we need to do something with this output? like logging it or does check_output pipe stderr in a way that LUCI can capture it?

Copy link
Contributor Author

@dnfield dnfield Oct 11, 2019

Choose a reason for hiding this comment

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

If the exception is raised, the exception object will contain the output. It doesn't do that for check_call.

Actually, I think we don't even need to store the output - I was thinking that would prevent printing it but that doesn't make sense.


# Archive the package
try:
output = subprocess.check_output(pm_command_base + ['archive'])
except subprocess.CalledProcessError as e:
print('The "%s" command failed:' % e.cmd)
print(e.output)
raise
# Use check_output so if anything goes wrong we get the output.
output = subprocess.check_output(pm_command_base + ['archive'])

return 0

Expand Down