0.5.15cnc6-alt18

- apt-get: Fixed APT::Get::PrintLocalFile for local files (#8902).
This commit is contained in:
Дмитрий Левин 2006-02-21 00:47:29 +00:00
parent 1b451e55ac
commit b7ffdc5104
2 changed files with 13 additions and 7 deletions

View File

@ -1,41 +1,44 @@
--- apt-0.5.15cnc6/cmdline/apt-get.cc.orig 2005-11-25 16:23:26 +0000
+++ apt-0.5.15cnc6/cmdline/apt-get.cc 2005-11-25 19:12:14 +0000
@@ -1025,6 +1025,13 @@ bool InstallPackages(CacheFile &Cache,bo
@@ -1025,6 +1025,14 @@ bool InstallPackages(CacheFile &Cache,bo
// Just print out the uris an exit if the --print-uris flag was used
if (_config->FindB("APT::Get::Print-URIs") == true)
{
+ if (_config->FindB("APT::Get::PrintLocalFile"))
+ {
+ struct stat stb;
+ for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I < Fetcher.ItemsEnd(); ++I)
+ if (((*I)->Local))
+ if (((*I)->Local) && !stat((*I)->DestFile.c_str(), &stb))
+ cout << (*I)->DestFile << endl;
+ return true;
+ }
pkgAcquire::UriIterator I = Fetcher.UriBegin();
for (; I != Fetcher.UriEnd(); I++)
cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' <<
@@ -1719,6 +1726,13 @@ bool DoUpdate(CommandLine &CmdL)
@@ -1719,6 +1726,14 @@ bool DoUpdate(CommandLine &CmdL)
// Just print out the uris an exit if the --print-uris flag was used
if (_config->FindB("APT::Get::Print-URIs") == true)
{
+ if (_config->FindB("APT::Get::PrintLocalFile"))
+ {
+ struct stat stb;
+ for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I < Fetcher.ItemsEnd(); ++I)
+ if (((*I)->Local))
+ if (((*I)->Local) && !stat((*I)->DestFile.c_str(), &stb))
+ cout << (*I)->DestFile << endl;
+ return true;
+ }
pkgAcquire::UriIterator I = Fetcher.UriBegin();
for (; I != Fetcher.UriEnd(); I++)
cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' <<
@@ -2533,6 +2547,13 @@ bool DoSource(CommandLine &CmdL)
@@ -2533,6 +2547,14 @@ bool DoSource(CommandLine &CmdL)
// Just print out the uris an exit if the --print-uris flag was used
if (_config->FindB("APT::Get::Print-URIs") == true)
{
+ if (_config->FindB("APT::Get::PrintLocalFile"))
+ {
+ struct stat stb;
+ for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I < Fetcher.ItemsEnd(); ++I)
+ if (((*I)->Local))
+ if (((*I)->Local) && !stat((*I)->DestFile.c_str(), &stb))
+ cout << (*I)->DestFile << endl;
+ return true;
+ }

View File

@ -2,7 +2,7 @@
Name: apt
Version: 0.5.15cnc6
Release: alt17.1
Release: alt18
Summary: Debian's Advanced Packaging Tool with RPM support
Summary(ru_RU.KOI8-R): Debian APT - õÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÎÏÅ ÓÒÅÄÓÔ×Ï ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ Ó ÐÏÄÄÅÒÖËÏÊ RPM
@ -364,6 +364,9 @@ fi
# Probably %%doc with README.rsync?
%changelog
* Tue Feb 21 2006 Dmitry V. Levin <ldv@altlinux.org> 0.5.15cnc6-alt18
- apt-get: Fixed APT::Get::PrintLocalFile for local files (#8902).
* Fri Dec 30 2005 ALT QA Team Robot <qa-robot@altlinux.org> 0.5.15cnc6-alt17.1
- Rebuilt with libreadline.so.5.