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

Fix conkeyref with temp file scheme that flattens the directory structure #3260

Merged
merged 2 commits into from Mar 21, 2019

Conversation

Projects
2 participants
@jelovirt
Copy link
Member

commented Mar 19, 2019

Description

Fix conkeyref processing to work correctly with temporary file scheme that doesn't generate matching directory structure, e.g. one that flattens the structure.

Motivation and Context

Fixes issue with conkeyref.

How Has This Been Tested?

Additional unit tests were added.

Type of Changes

  • Bug fix (non-breaking change which fixes an issue)

jelovirt added some commits Mar 16, 2019

Use getInputFile instead of getInputMap and resolve manually
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
Fix relative path getter for conkeyref
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>

@jelovirt jelovirt self-assigned this Mar 19, 2019

@jelovirt jelovirt added this to In progress in 3.3.1 via automation Mar 19, 2019

@jelovirt jelovirt requested a review from robander Mar 19, 2019

@jelovirt jelovirt moved this from In progress to Needs review in 3.3.1 Mar 19, 2019

3.3.1 automation moved this from Needs review to Reviewer approved Mar 19, 2019

@jelovirt jelovirt merged commit 094c5eb into develop Mar 21, 2019

4 checks passed

DCO DCO
Details
WIP Ready for review
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

3.3.1 automation moved this from Reviewer approved to Done Mar 21, 2019

@jelovirt jelovirt added this to the 3.3.1 milestone Mar 21, 2019

infotexture added a commit that referenced this pull request Mar 26, 2019

Merge pull request #3260 from dita-ot/feature/refactor-input-file
Fix conkeyref with temp file scheme that flattens the directory structure

* feature/refactor-input-file:
  Fix relative path getter for conkeyref
  Use getInputFile instead of getInputMap and resolve manually

Signed-off-by: Roger Sheen <roger@infotexture.net>

@jelovirt jelovirt deleted the feature/refactor-input-file branch Mar 29, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.