"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "apt-pkg/acquire-item.cc" between
apt-2.2.3.tar.gz and apt-2.2.4.tar.gz

About: Apt (Advanced Package Tool) is a management system for software packages (Debian/Ubuntu). Release series 2.2.

acquire-item.cc  (apt-2.2.3):acquire-item.cc  (apt-2.2.4)
skipping to change at line 3854 skipping to change at line 3854
delete d; delete d;
} }
/*}}}*/ /*}}}*/
// AcqFile::pkgAcqFile - Constructor /*{{{*/ // AcqFile::pkgAcqFile - Constructor /*{{{*/
pkgAcqFile::pkgAcqFile(pkgAcquire *const Owner, string const &URI, HashStringLis t const &Hashes, pkgAcqFile::pkgAcqFile(pkgAcquire *const Owner, string const &URI, HashStringLis t const &Hashes,
unsigned long long const Size, string const &Dsc, string c onst &ShortDesc, unsigned long long const Size, string const &Dsc, string c onst &ShortDesc,
const string &DestDir, const string &DestFilename, const string &DestDir, const string &DestFilename,
bool const IsIndexFile) : Item(Owner), d(NULL), IsIndexFil e(IsIndexFile), ExpectedHashes(Hashes) bool const IsIndexFile) : Item(Owner), d(NULL), IsIndexFil e(IsIndexFile), ExpectedHashes(Hashes)
{ {
::URI url{URI};
if (url.Path.find(' ') != std::string::npos || url.Path.find('%') == std::str
ing::npos)
url.Path = pkgAcquire::URIEncode(url.Path);
if(!DestFilename.empty()) if(!DestFilename.empty())
DestFile = DestFilename; DestFile = DestFilename;
else if(!DestDir.empty()) else if(!DestDir.empty())
DestFile = DestDir + "/" + flNotDir(URI); DestFile = DestDir + "/" + DeQuoteString(flNotDir(url.Path));
else else
DestFile = flNotDir(URI); DestFile = DeQuoteString(flNotDir(url.Path));
::URI url{URI};
if (url.Path.find(' ') != std::string::npos || url.Path.find('%') == std::str
ing::npos)
url.Path = pkgAcquire::URIEncode(url.Path);
// Create the item // Create the item
Desc.URI = std::string(url); Desc.URI = std::string(url);
Desc.Description = Dsc; Desc.Description = Dsc;
Desc.Owner = this; Desc.Owner = this;
// Set the short description to the archive component // Set the short description to the archive component
Desc.ShortDesc = ShortDesc; Desc.ShortDesc = ShortDesc;
// Get the transfer sizes // Get the transfer sizes
 End of changes. 3 change blocks. 
7 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)