Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Make Linux sandbox error message more useful #171

Merged
merged 2 commits into from
Mar 24, 2017
Merged

Conversation

diracdeltas
Copy link
Member

@diracdeltas diracdeltas requested a review from bbondy March 23, 2017 22:09
@@ -57,7 +57,7 @@ index 8587356ddcca34cdcad716ba7395666ec7ce4380..ad3e31e8ae859c0b02a57b6d2867ae4a
}
}
diff --git a/src/inspector/inspector.gyp b/src/inspector/inspector.gyp
index 6246f0ac0e7edfbe2272a577a648dcf08f868bb1..8dd41a110f63cb25f7bf3abfa9b42a3a910e78e0 100644
index c70722f852b60831250b9c91bdf3abf71650425d..9a001e756ef61565cd144da12e63b49964693152 100644
Copy link
Collaborator

Choose a reason for hiding this comment

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

this doesn't look like it is supposed to be part of this change

Copy link
Member Author

Choose a reason for hiding this comment

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

it was generated by npm run update_patches. running this command on muon/master with no chromium changes produces the following diff:

diff --git a/patches/v8/filter.patch b/patches/v8/filter.patch
index 066532349..aa5fb63fe 100644
--- a/patches/v8/filter.patch
+++ b/patches/v8/filter.patch
@@ -57,7 +57,7 @@ index 8587356ddcca34cdcad716ba7395666ec7ce4380..ad3e31e8ae859c0b02a57b6d2867ae4a
    }
  }
 diff --git a/src/inspector/inspector.gyp b/src/inspector/inspector.gyp
-index 6246f0ac0e7edfbe2272a577a648dcf08f868bb1..8dd41a110f63cb25f7bf3abfa9b42a3a910e78e0 100644
+index c70722f852b60831250b9c91bdf3abf71650425d..9a001e756ef61565cd144da12e63b49964693152 100644
 --- a/src/inspector/inspector.gyp
 +++ b/src/inspector/inspector.gyp
 @@ -4,7 +4,7 @@

Copy link
Collaborator

Choose a reason for hiding this comment

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

update_patches will pull in whatever you have locally, but this clearly isn't related to your changes so safer to just remove it I think

@diracdeltas
Copy link
Member Author

diracdeltas commented Mar 23, 2017

removed filter.patch diff

@bridiver bridiver merged commit f5bc23c into master Mar 24, 2017
@bridiver
Copy link
Collaborator

++

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants