diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-04-08 12:24:50 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-04-08 12:24:50 +0200 |
| commit | 460f0f95b22c36ddc5f184cef33c54a482b5f112 (patch) | |
| tree | 324f78bd2fdddd6131301129d67fad5e9bf36871 /apt-pkg/acquire-item.cc | |
| parent | 0c235e5d6658bebe3daab6c708d112b3794fd809 (diff) | |
| parent | d5cf8851753dde4f45bfd3b48fcdf34247a8752a (diff) | |
Merge remote-tracking branch 'origin/debian/jessie' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'apt-pkg/acquire-item.cc')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 253cbdaf7..0bcafdc5c 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1194,8 +1194,18 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash, Desc.URI = decompProg + ":" + FileName; QueueURI(Desc); - // FIXME: this points to a c++ string that goes out of scope - Mode = decompProg.c_str(); + if (decompProg == "copy") + Mode = "copy"; + else if (decompProg == "xz") + Mode = "xz"; + else if (decompProg == "lzma") + Mode = "lzma"; + else if (decompProg == "bzip2") + Mode = "bzip2"; + else if (decompProg == "gzip") + Mode = "gzip"; + else + Mode = "decomp"; } /*}}}*/ // AcqIndexTrans::pkgAcqIndexTrans - Constructor /*{{{*/ |