diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
| commit | aa0bd601ea3db281187275bbbece760d85ff29d9 (patch) | |
| tree | c84bebb3966255cdae36562024592c6b4eb6a2f2 /cmdline/apt-helper.cc | |
| parent | 80624be7c54aec6ed98ee254366155024fca1a71 (diff) | |
| parent | 6074bc9ba4ecdd08674a828bdb46323b5d8bf957 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
debian/changelog
Diffstat (limited to 'cmdline/apt-helper.cc')
| -rw-r--r-- | cmdline/apt-helper.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index 2c1107d90..b0edafcbd 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -43,7 +43,8 @@ static bool DoDownloadFile(CommandLine &CmdL) std::string hash; if (CmdL.FileSize() > 3) hash = CmdL.FileList[3]; - new pkgAcqFile(&Fetcher, download_uri, hash, 0, "desc", "short-desc", + // we use download_uri as descr and targetfile as short-descr + new pkgAcqFile(&Fetcher, download_uri, hash, 0, download_uri, targetfile, "dest-dir-ignored", targetfile); Fetcher.Run(); bool Failed = false; |