diff options
author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-11-23 17:11:45 +0000 |
---|---|---|
committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-11-23 17:11:45 +0000 |
commit | 206b553334f83cc14087abc15ea5a4fd5376e583 (patch) | |
tree | 57b18474256aa982f1b2890e08a28666485bfd6a /apt-pkg/acquire-item.cc | |
parent | 5f94945b7ad11431f2d1bca3fd2fd240e9e94a3c (diff) | |
parent | df96f2e54f977e9c3d7531a97a0b84788ac3f44c (diff) |
Merge changes from Hoary (0.5.30,0.5.30ubuntu2]
Patches applied:
* michael.vogt@canonical.com--2004/apt--mvo--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-14
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-1
* imported the changes from 0.5.30 to 0.5.30ubuntu2
Diffstat (limited to 'apt-pkg/acquire-item.cc')
-rw-r--r-- | apt-pkg/acquire-item.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index bf19290c6..6227888b6 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -144,7 +144,10 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, DestFile += URItoFileName(URI); // Create the item - Desc.URI = URI + ".bz2"; + if(FileExists("/usr/bin/bzip2")) + Desc.URI = URI + ".bz2"; + else + Desc.URI = URI + ".gz"; Desc.Description = URIDesc; Desc.Owner = this; Desc.ShortDesc = ShortDesc; |