addurl: Normalize badly encoded urls.
This commit is contained in:
parent
ac97454659
commit
1c0bd81ba6
2 changed files with 5 additions and 3 deletions
|
@ -31,10 +31,11 @@ seek = [withField fileOption return $ \f ->
|
|||
withStrings $ start f]
|
||||
|
||||
start :: Maybe FilePath -> String -> CommandStart
|
||||
start optfile s = notBareRepo $ go $ parseURI s
|
||||
start optfile s = notBareRepo $ go $ fromMaybe bad $ parseURI s
|
||||
where
|
||||
go Nothing = error $ "bad url " ++ s
|
||||
go (Just url) = do
|
||||
bad = fromMaybe (error $ "bad url " ++ s) $
|
||||
parseURI $ escapeURIString isUnescapedInURI s
|
||||
go url = do
|
||||
let file = fromMaybe (url2file url) optfile
|
||||
showStart "addurl" file
|
||||
next $ perform s file
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -16,6 +16,7 @@ git-annex (3.20120124) UNRELEASED; urgency=low
|
|||
filename that is used when adding an url, which is based on the url.
|
||||
Or, when the file already exists, the url is recorded as another
|
||||
location of the file.
|
||||
* addurl: Normalize badly encoded urls.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Tue, 24 Jan 2012 16:21:55 -0400
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue