diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-19 16:41:55 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-19 16:41:55 +0200 |
| commit | 9da539c5aff025aab99537be1c75e8c6a853fd83 (patch) | |
| tree | ef94188d861699977f2ceee8510c5dfbdcf22ca4 /methods/copy.cc | |
| parent | 8b451962751298876d1f399e4de492d8adbb135a (diff) | |
Fix regression when copy: is used for a relative path
When we do a ReverifyAfterIMS() we use the copy: method to
verify the hashes again. If the user uses -o Dir=./something/relative
this fails because we use the URI class in copy.cc that strips
away the leading relative part. By not using URI this is fixed.
Closes: #762160
Diffstat (limited to 'methods/copy.cc')
| -rw-r--r-- | methods/copy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/methods/copy.cc b/methods/copy.cc index 5570f31c8..b78053d36 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -55,8 +55,8 @@ void CopyMethod::CalculateHashes(FetchResult &Res) /* */ bool CopyMethod::Fetch(FetchItem *Itm) { - URI Get = Itm->Uri; - std::string File = Get.Path; + // this ensures that relative paths work in copy + std::string File = Itm->Uri.substr(Itm->Uri.find(':')+1); // Stat the file and send a start message struct stat Buf; |