Skip to content

ohos: Remove catch in sign script so that the error is propogated and not ignored#139

Merged
jschwe merged 1 commit into
servo:mainfrom
janeoa:fix-signing-util-errors
Jun 10, 2026
Merged

ohos: Remove catch in sign script so that the error is propogated and not ignored#139
jschwe merged 1 commit into
servo:mainfrom
janeoa:fix-signing-util-errors

Conversation

@janeoa

@janeoa janeoa commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

In the current state, when running

uv run main.py ~/path-to-build-profile.json5

from the docker/runner/signing-util, there is a case when it fails:

When the build-profile.json5 is valid, but material dir is not present, the script will still print out "File sign.sh written" and the file will actually be written. But instead of expected contents, the file would have a node error message inside it. Because the python does

return subprocess.check_output(["node", "sign.js", path, password])

but the JS:

...
    } catch (e) {
      console.log(e);
    }

so the current PR just removes the catch, so that the error can propagate and now python returns full error message into the stdout and does not produce the sign.sh

Signed-off-by: Jane <5373400+janeoa@users.noreply.github.com>
@janeoa janeoa requested a review from jschwe as a code owner June 10, 2026 12:52
@jschwe jschwe changed the title Remove catch so that the error is propogated and not ignored ohos: Remove catch in sign script so that the error is propogated and not ignored Jun 10, 2026

@Narfinger Narfinger left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good. Thanks for the cleanup!

@jschwe jschwe merged commit 3149614 into servo:main Jun 10, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants