mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

addurl --pathdepth: Fix failure when the pathdepth specified is deeper than the urls's path.

Browse source
This commit is contained in:
Joey Hess 2013-07-05 12:46:38 -04:00
parent d84a000e92
commit 74ad3072e4
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Command/AddUrl.hs
View file

@ -151,6 +151,7 @@ url2file :: URI -> Maybe Int -> FilePath
url2file url pathdepth = case pathdepth of url2file url pathdepth = case pathdepth of
Nothing -> filesize $ escape fullurl Nothing -> filesize $ escape fullurl
Just depth Just depth
| depth >= length urlbits -> frombits id
| depth > 0 -> frombits $ drop depth | depth > 0 -> frombits $ drop depth
| depth < 0 -> frombits $ reverse . take (negate depth) . reverse | depth < 0 -> frombits $ reverse . take (negate depth) . reverse
| otherwise -> error "bad --pathdepth" | otherwise -> error "bad --pathdepth"

2
debian/changelog vendored
View file

@ -15,6 +15,8 @@ git-annex (4.20130628) UNRELEASED; urgency=low
* init: Detect systems on which git commit fails due to not being able to * init: Detect systems on which git commit fails due to not being able to
determine the FQDN, and put in a workaround so committing to the git-annex determine the FQDN, and put in a workaround so committing to the git-annex
branch works. branch works.
* addurl --pathdepth: Fix failure when the pathdepth specified is deeper
than the urls's path.
-- Joey Hess <joeyh@debian.org> Tue, 02 Jul 2013 15:40:55 -0400 -- Joey Hess <joeyh@debian.org> Tue, 02 Jul 2013 15:40:55 -0400

6
doc/bugs/addurl:___34__rename:_does_not_exist__34___and_reports_fail__44___but_succeeds.mdwn
View file

@ -189,3 +189,9 @@ All interesting transcripts are posted above with cruft removed.
# End of transcript or log. # End of transcript or log.
"""]] """]]
> The cause of this bug is using --pathdepth=3 when the url
> only has two components in its path. So, kinda GIGO, but
> let's fix this anyway. ;)
>
> [[fixed|done]] --[[Joey]]