Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mullvad Browser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Applications
Mullvad Browser
Commits
4c4f24bd
Commit
4c4f24bd
authored
2 years ago
by
Sandor Molnar
Browse files
Options
Downloads
Patches
Plain Diff
Backed out changeset 87d747a7a020 (bug 1795158) at Alex's (dev) request. CLOSED TREE
parent
13eee7de
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ipc/ipdl/ipdl/parser.py
+1
-19
1 addition, 19 deletions
ipc/ipdl/ipdl/parser.py
with
1 addition
and
19 deletions
ipc/ipdl/ipdl/parser.py
+
1
−
19
View file @
4c4f24bd
...
...
@@ -4,7 +4,7 @@
import
os
from
ply
import
lex
,
yacc
from
pathlib
import
Path
from
ipdl.ast
import
*
# -----------------------------------------------------------------------------
...
...
@@ -59,24 +59,6 @@ class Parser:
def
parse
(
self
,
input
,
filename
,
includedirs
):
assert
os
.
path
.
isabs
(
filename
)
# https://bugzilla.mozilla.org/show_bug.cgi?id=1795158
# On Azure the absolute file paths for 'filename' that go through this function
# can originate from two different mount points (eg: "z:/build/workspace" and
# "Z:/task_XYZ/workspace"). Both file paths essentially point to the same logical
# file, but the file paths are ultimately different. We could not track down
# what was causing both mount points to be used on Azure, but not AWS, so the
# workaround we came up with is to strip the two leading path segments before
# doing the comparison.
#
# Example: "Z:/task_XYZ/workspace/obj/ipc.ipdl" and "z:/build/workspace/obj/ipc.ipdl"
# are being compared, by stripping the two leading path segments from both, they
# become "workspace/obj/ipc.ipdl" and "workspace/obj/ipc.ipdl", respectively.
#
# It would be ideal to find the root cause of this issue, rather than having this
# workaround here, because if the number of directories in the mount point changes,
# this will break.
filename
=
Path
(
*
Path
(
filename
).
parts
[
2
:]).
as_posix
()
if
self
.
tu
.
name
in
Parser
.
parsed
:
priorTU
=
Parser
.
parsed
[
self
.
tu
.
name
].
tu
if
os
.
path
.
normcase
(
priorTU
.
filename
)
!=
os
.
path
.
normcase
(
filename
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment