Do not replace \ with / in file:// URLs on Windows #4269

Merged
merged 1 commit into from Jan 12, 2017

Projects

None yet

3 participants

@gomyhr
gomyhr commented Jan 11, 2017

This makes channel URLs of the type

file://\server\share\dir

and

file://\\server\share\dir  # Windows uses this form internally

work again on Windows after it stopped working in the 4.2.x branch after version 4.2.9. More precisely, the last good commit was 63c67ad and the first bad commit is 027ee0d. The intermediate commits are savepoints where conda install does not run.

It was mentioned in issue #3779 that some instances of value = value.replace('\\', '/') could be the cause of the URLs not working anymore.

This is a fix for the 4.2.x branch only, and relevant only if there will be more 4.2.x releases. The proper fix for Windows UNC network paths was already merged into 4.3.x in PR #4190. This 4.2.x fix does not attempt to include support for the actual standard compliant URL file://server/share/dir, only to restore the forms that worked in 4.2.9 and earlier.

Geir Ove Myhr Do not replace \ with / in URLs on Windows
This makes channel URLs of the type
  file://\server\share\dir
and
  file://\\server\share\dir
work again.

However, URLs with spaces still do not work.
2c7bc28
@codecov-io

Current coverage is 79.73% (diff: 100%)

Merging #4269 into 4.2.x will decrease coverage by 0.01%

@@              4.2.x      #4269   diff @@
==========================================
  Files            59         59          
  Lines          8361       8357     -4   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
- Hits           6667       6663     -4   
  Misses         1694       1694          
  Partials          0          0          

Powered by Codecov. Last update febffec...2c7bc28

@kalefranz kalefranz merged commit 84d28ea into conda:4.2.x Jan 12, 2017

5 checks passed

clahub All contributors have signed the Contributor License Agreement.
Details
codecov/patch Coverage not affected when comparing febffec...2c7bc28
Details
codecov/project Absolute coverage decreased by -0.01% but relative coverage increased by +20.26% compared to febffec
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@kalefranz
Member

Ok, I've completed the merge here. Then merged up to 4.3.x. And then reverted the 2c7bc28 commit with 694d29f. So I think we're good moving forward.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment