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.

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

Use correct appguid for darwin when uploading to Omaha #1197

Merged
merged 2 commits into from
Jan 3, 2019

Conversation

mbacchi
Copy link
Contributor

@mbacchi mbacchi commented Jan 2, 2019

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@mbacchi mbacchi self-assigned this Jan 2, 2019
@mbacchi
Copy link
Contributor Author

mbacchi commented Jan 2, 2019

Fixes brave/brave-browser#2790

@@ -71,7 +71,7 @@ def get_base64_authorization(omahaid, omahapw):

# To-Do: Add functions to create apps
def get_appguid(channel, platform):
if channel in 'dev' or channel in 'release' and platform in 'darwin':
if channel in 'dev' or platform in 'darwin' and channel in ['beta', 'dev', 'release']:
Copy link
Member

Choose a reason for hiding this comment

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

I think maybe you mean:
if channel in ['dev'] or platform in ['darwin'] and channel in ['beta', 'dev', 'release']:

Otherwise for example 'e' is in 'dev'

Copy link
Member

Choose a reason for hiding this comment

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

or by using == like channel == 'dev'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed that if statement. Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess I can't resolve a change request by you @bbondy. Do you mind resolving it so I can merge?

Copy link
Collaborator

@mihaiplesa mihaiplesa left a comment

Choose a reason for hiding this comment

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

looks good now

@bbondy bbondy merged commit 5482075 into master Jan 3, 2019
@bbondy bbondy added the 0.61.x label Jan 3, 2019
@mbacchi mbacchi deleted the sparkle-appguid branch January 4, 2019 15:40
@bbondy bbondy added this to the 0.61.x - Nightly milestone Jan 14, 2019
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.

4 participants