Summary

Fix path concatenation to prevent leading double slash

Review Request #6962 — Created Feb. 18, 2015 and submitted Feb. 21, 2015, 3:17 p.m.

Information

Owner

gmyers

Repository

RBTools

Branch

master

Bugs

Depends On

Commit

2fdeb88...

Reviewers

Groups

rbtools

People

Description

In SVNClient.convert_to_absolute_paths() when concatenating paths when the --repository-url option is specified, it was possible to end up with a leading double slash when repository_info.base_path was '/'. Switch to posixpath.join() to correctly concatenate paths for all cases, with platform independent Unix-style slashes.

Testing Done

Tested on both Linux and Windows.

Tested where base_path = '/':
Old output: //file.txt
New output: /file.txt

Tested where base_path = '/foo':
Old output: /foo/file.txt
New output: /foo/file.txt

Issues

Description	From	Last Updated
If running on a windows system, does this do the wrong thing and join with '\'?	david	Feb. 20, 2015, 7:08 p.m.

Tool: PEP8 Style Checker
Processed Files:
    rbtools/clients/svn.py



Tool: Pyflakes
Processed Files:
    rbtools/clients/svn.py

rbtools/clients/svn.py (Diff revision 1)

Show all issues

If running on a windows system, does this do the wrong thing and join with '\'?

gmyers Feb. 19, 2015, 5:47 p.m.

Ugh.  You're right this is not cross-platform.  Can't believe I overlooked this.  I'll find a more robust solution and make sure I've tested it in Windows and Linux.

Description:

~		In `SVNClient.convert_to_absolute_paths()` when concatenating paths when the --repository-url option is specified, it was possible to end up with a leading double slash when `repository_info.base_path` was '/'. Switch to `os.path.join()` to correctly concatenate paths for all cases.
	~	In `SVNClient.convert_to_absolute_paths()` when concatenating paths when the --repository-url option is specified, it was possible to end up with a leading double slash when `repository_info.base_path` was '/'. Switch to `posixpath.join()` to correctly concatenate paths for all cases, with platform independent Unix-style slashes.

Testing Done:

	+	Tested on both Linux and Windows.
	+
		Tested where base_path = '/':
		Old output: //file.txt
		New output: /file.txt

		Tested where base_path = '/foo':
		Old output: /foo/file.txt
		New output: /foo/file.txt

Commit:

-	528b852139dc22be1bf7534be10aed528baed677
+	2fdeb88c847e3f5f8c4deb18a44d8d1005117ac3

Diff:

Revision 2 (+2 -1)

Show changes

rbtools/clients/svn.py

Tool: PEP8 Style Checker
Processed Files:
    rbtools/clients/svn.py



Tool: Pyflakes
Processed Files:
    rbtools/clients/svn.py

Ship it!

```
Ship It!
```

Status: Closed (submitted)

Change Summary:

Pushed to release-0.7.x (f6828a5)