darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

0.5.15lorg2-alt6

Browse Source 
- apt-get: Fixed virtual packages handling (Alexey Tourbin).
- apt-get: Implemented simple-output option (Stanislav Ievlev).
This commit is contained in:
Дмитрий Левин 2006-10-10 15:33:58 +00:00
parent 9960833d4e
commit 9eacf5f64e
3 changed files with 374 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
apt-0.5.15lorg2-alt-apt-get-TryToInstall-PrvPkgCandVer.patch Normal file
View File

@ -0,0 +1,88 @@
Date: Tue, 10 Oct 2006 04:40:28 +0400
From: Alexey Tourbin <at@altlinux.ru>
To: ALT Devel discussion list <devel@lists.altlinux.org>
Message-ID: <20061010004028.GH23308@localhost.localdomain>
Mail-Followup-To: ALT Devel discussion list <devel@lists.altlinux.org>
References: <20061009223236.GG23308@localhost.localdomain>
<20061009224152.GC18762@basalt.office.altlinux.org>
In-Reply-To: <20061009224152.GC18762@basalt.office.altlinux.org>
Subject: Re: [devel] apt virtual packages
List-Id: ALT Devel discussion list <devel.lists.altlinux.org>
On Tue, Oct 10, 2006 at 02:41:52AM +0400, Dmitry V. Levin wrote:
> > íÏÖÎÏ ËÏÎÅÞÎÏ × ÂÁÇÚÉÌÌÕ ÎÁÐÉÓÁÔØ ÉÌÉ ÓÁÍÏÍÕ
> > × ÁÐÔÅ ËÏ×ÙÒÑÔØÓÑ, ÎÏ ÍÏÖÅÔ ÂÙÔØ ÕÖÅ ËÔÏ-ÔÏ ÚÎÁÅÔ?
>
> ñ ÂÕÄÕ ÐÒÉÚÎÁÔÅÌÅÎ ÔÏÍÕ, ËÔÏ ÒÅÛÉÔ ÜÔÕ ÚÁÄÁÞÕ (Ô.Å. ÚÁÆÉËÓÉÔ apt).
ñ ×ÒÏÄÅ ÂÙ ÚÁÆÉËÓÉÌ, ÈÏÔÑ ÍÅÎÑ ÇÌÏÖÕÔ ÓÏÍÎÅÎÉÑ.
--- apt-0.5.15lorg2/cmdline/apt-get.cc.orig 2006-10-10 15:13:17 +0000
+++ apt-0.5.15lorg2/cmdline/apt-get.cc 2006-10-10 15:24:40 +0000
@@ -1275,14 +1275,18 @@ bool TryToInstall(pkgCache::PkgIterator
continue;
}
// Is the provides pointing to the candidate version?
- if (PrvPkgCandVer == Prv.OwnerVer())
+ bool good = false;
+ for (; PrvPkgCandVer.end() == false; ++PrvPkgCandVer)
{
- // Yes, it is. This is a good solution.
- GoodSolutions.push_back(PrvPkg);
- if (instVirtual)
- break;
- continue;
+ if (PrvPkgCandVer == Prv.OwnerVer())
+ {
+ // Yes, it is. This is a good solution.
+ good = true;
+ GoodSolutions.push_back(PrvPkg);
+ }
}
+ if (good && instVirtual)
+ break;
}
vector<string> GoodSolutionNames;
unsigned int GoodSolutionsInstalled = 0, GoodSolutionInstallNumber = 0;
End of patch
÷ÏÔ ÐÏÌÎÏÓÔØÀ ÒÅÌÅ×ÁÎÔÎÙÊ ËÕÓÏË ËÏÄÁ (ÉÓÐÒÁ×ÌÅÎÎÙÊ).
1270 pkgCache::VerIterator PrvPkgCandVer =
1271 Cache[PrvPkg].CandidateVerIter(Cache);
1272 if (PrvPkgCandVer.end() == true)
1273 {
1274 // Packages without a candidate version are not good solutions.
1275 continue;
1276 }
1277 // Is the provides pointing to the candidate version?
1278 bool good = false;
1279 for (; PrvPkgCandVer.end() == false; ++PrvPkgCandVer)
1280 {
1281 if (PrvPkgCandVer == Prv.OwnerVer())
1282 {
1283 // Yes, it is. This is a good solution.
1284 good = true;
1285 GoodSolutions.push_back(PrvPkg);
1286 }
1287 }
1288 if (good && instVirtual)
1289 break;
1290 }
úÄÅÓØ PrvPkg -- ÜÔÏ ÒÅÁÌØÎÙÊ ÐÁËÅÔ, ËÏÔÏÒÙÊ ÐÒÏ×ÁÊÄÉÔ ×ÉÒÔÕÁÌØÎÕÀ
ÚÁ×ÉÓÉÍÏÓÔØ. íÙ ÐÒÏ×ÅÒÑÅÍ, ÅÓÔØ ÌÉ Õ ÒÅÁÌØÎÏÇÏ ÐÁËÅÔÁ "×ÅÒÓÉÑ".
(þÔÏ ÔÁËÏÅ "×ÅÒÓÉÑ"? ñ ÐÌÏÈÏ ÐÏÎÉÍÁÀ ×ÎÕÔÒÅÎÎÉÅ ÓÔÒÕËÔÕÒÙ ÁÐÔÁ, ÐÏÜÔÏÍÕ
É ÇÌÏÖÕÔ ÓÏÍÎÅÎÉÑ.) åÓÌÉ ÒÅÁÌØÎÙÊ ÐÁËÅÔ ÂÅÚ ×ÅÒÓÉÉ, ÔÏÇÄÁ ÏÎ ÎÅ ÔÑÎÅÔ
ÎÁ ÕÓÔÁÎÏ×ËÕ ÞÅÒÅÚ ×ÉÒÔÕÁÌØÎÕÀ ÚÁ×ÉÓÉÍÏÓÔØ. äÁÌÅÅ, × ÏÒÉÇÉÎÁÌØÎÏÍ ËÏÄÅ
ÐÒÏ×ÅÒÑÅÔÓÑ ÎÅÞÔÏ ÓÔÒÁÎÎÏÅ, ÞÔÏ Ñ ÎÅ ÍÏÇÕ ÄÏ ËÏÎÃÁ ÓÆÏÒÍÕÌÉÒÏ×ÁÔØ.
if (PrvPkgCandVer == Prv.OwnerVer())
óÍÙÓÌÅ × ÔÏÍ, ÞÔÏ ×ÅÒÓÉÑ PrvPkgCandVer, ÎÁÊÄÅÎÎÁÑ ÞÅÒÅÚ reverse lookup,
ÄÏÌÖÎÁ ÓÏ×ÐÁÄÁÔØ Ó ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏÊ ×ÅÒÓÉÅÊ Prv.OwnerVer(). ôÏÇÄÁ ÐÁËÅÔ
-- ÈÏÒÏÛÉÊ ËÁÎÄÉÄÁÔ. îÏ PrvPkgCandVer -- ÜÔÏ ÉÔÅÒÁÔÏÒ. ëÓÔÁÔÉ, ËÁÖÅÔÓÑ
Prv.OwnerVer ÜÔÏ ÔÏÖÅ ÉÔÅÒÁÔÏÒ. åÓÌÉ × ÒÅÐÏÚÉÔÁÒÉÉ ÏËÁÚÙ×ÁÅÔÓÑ Ä×Á
ÐÁËÅÔÁ Ó ÏÄÉÎÁËÏ×ÙÍ ÉÍÅÎÅÍ É ×ÅÒÓÉÅÊ, ÔÏ ÓÏ×ÐÁÄÅÎÉÅ ÓÒÁÚÕ ÖÅ ÎÅ
ÇÁÒÁÎÔÉÒÕÅÔÓÑ. ïÄÉÎ ÉÚ ÜÔÉÈ ÉÔÅÒÁÔÏÒÏ× ÎÕÖÎÏ "ÐÒÏËÒÕÔÉÔØ" É ÐÒÏ×ÅÒÑÔØ
ÕÓÌÏ×ÉÅ × ÃÉËÌÅ, ÞÔÏ Ñ É ÄÅÌÁÀ.

277
apt-0.5.15lorg2-alt-apt-get-simple-output.patch Normal file
View File

@ -0,0 +1,277 @@
--- apt-0.5.15lorg2/cmdline/apt-get.cc.orig 2006-10-10 20:43:05 +0000
+++ apt-0.5.15lorg2/cmdline/apt-get.cc 2006-10-10 20:43:32 +0000
@@ -71,6 +71,7 @@ using namespace std;
ostream c0out(0);
ostream c1out(0);
ostream c2out(0);
+ostream c3out(0); // script output stream
ofstream devnull("/dev/null");
unsigned int ScreenWidth = 80;
@@ -418,6 +419,7 @@ void ShowNew(ostream &out,CacheFile &Cac
}
}
+ if (!List.empty()) c3out<<"apt-get:install-list:"<<List<<endl;
ShowList(out,_("The following NEW packages will be installed:"),List,VersionsList);
}
/*}}}*/
@@ -469,8 +471,11 @@ void ShowDel(ostream &out,CacheFile &Cac
}
}
+
// CNC:2002-07-25
+ if (!RepList.empty()) c3out<<"apt-get:replace-list:"<<RepList<<endl;;
ShowList(out,_("The following packages will be REPLACED:"),RepList,VersionsList);
+ if (!List.empty()) c3out<<"apt-get:remove-list:"<<List<<endl;
ShowList(out,_("The following packages will be REMOVED:"),List,VersionsList);
}
/*}}}*/
@@ -493,6 +498,7 @@ void ShowKept(ostream &out,CacheFile &Ca
List += string(I.Name()) + " ";
VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
}
+ if (!List.empty()) c3out<<"apt-get:keep-list:"<<List<<endl;
ShowList(out,_("The following packages have been kept back"),List,VersionsList);
}
/*}}}*/
@@ -514,6 +520,7 @@ void ShowUpgraded(ostream &out,CacheFile
List += string(I.Name()) + " ";
VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
}
+ if (!List.empty()) c3out<<"apt-get:upgrade-list:"<<List<<endl;
ShowList(out,_("The following packages will be upgraded"),List,VersionsList);
}
/*}}}*/
@@ -535,6 +542,7 @@ bool ShowDowngraded(ostream &out,CacheFi
List += string(I.Name()) + " ";
VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
}
+ if (!List.empty()) c3out<<"apt-get:downgrade-list:"<<List<<endl;
return ShowList(out,_("The following packages will be DOWNGRADED"),List,VersionsList);
}
/*}}}*/
@@ -555,6 +563,7 @@ bool ShowHold(ostream &out,CacheFile &Ca
}
}
+ if (!List.empty()) c3out<<"apt-get:hold-list:"<<List<<endl;
return ShowList(out,_("The following held packages will be changed:"),List,VersionsList);
}
/*}}}*/
@@ -652,6 +661,7 @@ bool ShowEssential(ostream &out,CacheFil
}
delete [] Added;
+ if (!List.empty()) c3out<<"apt-get:essential-list:"<<List<<endl;
return ShowList(out,_("WARNING: The following essential packages will be removed\n"
"This should NOT be done unless you know exactly what you are doing!"),List,VersionsList);
}
@@ -705,6 +715,12 @@ void Stats(ostream &out,pkgDepCache &Dep
else if ((Dep[I].iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)
ReInstall++;
}
+ c3out<<"apt-get:status:upgrade:"<<Upgrade<<endl;
+ c3out<<"apt-get:status:downgrade:"<<Downgrade<<endl;
+ c3out<<"apt-get:status:install:"<<Install<<endl;
+ c3out<<"apt-get:status:re-install:"<<ReInstall<<endl;
+ c3out<<"apt-get:status:replace:"<<Replace<<endl;
+ c3out<<"apt-get:status:remove:"<<Remove<<endl;
ioprintf(out,_("%lu upgraded, %lu newly installed, "),
Upgrade,Install);
@@ -814,7 +830,7 @@ bool CacheFile::CheckDeps(bool AllowBrok
if (pkgFixBroken(*DCache) == false || DCache->BrokenCount() != 0)
{
c1out << _(" failed.") << endl;
- ShowBroken(c1out,*this,true);
+ ShowBroken(cerr,*this,true);
return _error->Error(_("Unable to correct dependencies"));
}
@@ -826,7 +842,7 @@ bool CacheFile::CheckDeps(bool AllowBrok
else
{
c1out << _("You might want to run `apt-get --fix-broken install' to correct these.") << endl;
- ShowBroken(c1out,*this,true);
+ ShowBroken(cerr,*this,true);
return _error->Error(_("Unmet dependencies. Try using --fix-broken."));
}
@@ -876,7 +892,7 @@ bool InstallPackages(CacheFile &Cache,bo
// Sanity check
if (Cache->BrokenCount() != 0)
{
- ShowBroken(c1out,Cache,false);
+ ShowBroken(cerr,Cache,false);
return _error->Error("Internal Error, InstallPackages was called with broken packages!");
}
@@ -955,6 +971,7 @@ bool InstallPackages(CacheFile &Cache,bo
else
ioprintf(c1out,_("After unpacking %sB disk space will be freed.\n"),
SizeToStr(-1*Cache->UsrSize()).c_str());
+ c3out<<"apt-get:status:disk-size:"<<SizeToStr(Cache->UsrSize())<<endl;
if (_error->PendingError() == true)
return false;
@@ -1011,6 +1028,7 @@ bool InstallPackages(CacheFile &Cache,bo
if (_config->FindI("quiet",0) < 2 &&
_config->FindB("APT::Get::Assume-Yes",false) == false)
{
+ c3out << "apt-get:wait-yes-no:" << endl;
c2out << _("Do you want to continue? [Y/n] ") << flush;
if (YnPrompt() == false)
@@ -1342,23 +1360,23 @@ bool TryToInstall(pkgCache::PkgIterator
}
else
{
- ioprintf(c1out,_("Package %s is a virtual package provided by:\n"),
+ ioprintf(cerr,_("Package %s is a virtual package provided by:\n"),
Pkg.Name());
for (unsigned int i = 0; i != GoodSolutions.size(); i++)
{
pkgCache::PkgIterator GoodPkg(Cache, GoodSolutions[i]);
if (GoodPkg.CurrentVer().end() == false)
- c1out << " " << GoodSolutionNames[i]
+ cerr << " " << GoodSolutionNames[i]
<< " " << Cache[GoodPkg].CandVersion
<< _(" [Installed]") << endl;
else
- c1out << " " << GoodSolutionNames[i]
+ cerr << " " << GoodSolutionNames[i]
<< " " << Cache[GoodPkg].CandVersion << endl;
}
if (Remove)
- c1out << _("You should explicitly select one to remove.") << endl;
+ cerr << _("You should explicitly select one to remove.") << endl;
else
- c1out << _("You should explicitly select one to install.") << endl;
+ cerr << _("You should explicitly select one to install.") << endl;
_error->Error(_("Package %s is a virtual package with multiple "
"good providers.\n"), Pkg.Name());
return false;
@@ -1446,6 +1464,7 @@ bool TryToInstall(pkgCache::PkgIterator
List += string(Dep.ParentPkg().Name()) + " ";
//VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ???
}
+ if (!List.empty()) c3out<<"apt-get:however-replace-list:"<<List<<endl;
ShowList(c1out,_("However the following packages replace it:"),List,VersionsList);
}
@@ -1827,7 +1846,7 @@ bool DoUpgrade(CommandLine &CmdL)
// Do the upgrade
if (pkgAllUpgrade(Cache) == false)
{
- ShowBroken(c1out,Cache,false);
+ ShowBroken(cerr,Cache,false);
return _error->Error(_("Internal Error, AllUpgrade broke stuff"));
}
@@ -2107,7 +2126,7 @@ bool DoInstall(CommandLine &CmdL)
if (BrokenFix == true && Cache->BrokenCount() != 0)
{
c1out << _("You might want to run `apt-get --fix-broken install' to correct these:") << endl;
- ShowBroken(c1out,Cache,false);
+ ShowBroken(cerr,Cache,false);
return _error->Error(_("Unmet dependencies. Try 'apt-get --fix-broken install' with no packages (or specify a solution)."));
}
@@ -2146,7 +2165,7 @@ bool DoInstall(CommandLine &CmdL)
c1out << _("The following information may help to resolve the situation:") << endl;
c1out << endl;
- ShowBroken(c1out,Cache,false);
+ ShowBroken(cerr,Cache,false);
return _error->Error(_("Broken packages"));
}
@@ -2174,6 +2193,7 @@ bool DoInstall(CommandLine &CmdL)
}
}
+ if (!List.empty()) c3out<<"apt-get:extra-list:"<<List<<endl;
ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList);
}
@@ -2254,7 +2274,9 @@ bool DoInstall(CommandLine &CmdL)
}
}
}
+ if (!SuggestsList.empty()) c3out<<"apt-get:suggest-list:"<<SuggestsList<<endl;
ShowList(c1out,_("Suggested packages:"),SuggestsList,SuggestsVersions);
+ if (!RecommendsList.empty()) c3out<<"apt-get:recommended-list:"<<RecommendsList<<endl;
ShowList(c1out,_("Recommended packages:"),RecommendsList,RecommendsVersions);
}
@@ -2283,7 +2305,7 @@ bool DoDistUpgrade(CommandLine &CmdL)
if (pkgDistUpgrade(*Cache) == false)
{
c0out << _("Failed") << endl;
- ShowBroken(c1out,Cache,false);
+ ShowBroken(cerr,Cache,false);
return false;
}
@@ -2362,7 +2384,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
if (Fix.Resolve() == false)
{
- ShowBroken(c1out,Cache,false);
+ ShowBroken(cerr,Cache,false);
return _error->Error("Internal Error, problem resolver broke stuff");
}
}
@@ -2370,7 +2392,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
// Now upgrade everything
if (pkgAllUpgrade(Cache) == false)
{
- ShowBroken(c1out,Cache,false);
+ ShowBroken(cerr,Cache,false);
return _error->Error("Internal Error, problem resolver broke stuff");
}
@@ -3007,7 +3029,7 @@ bool DoBuildDep(CommandLine &CmdL)
if (Cache->BrokenCount() != 0)
{
// CNC:2004-07-05
- ShowBroken(c1out, Cache, false);
+ ShowBroken(cerr, Cache, false);
return _error->Error(_("Some broken packages were found while trying to process build-dependencies for %s.\n"
"You might want to run `apt-get --fix-broken install' to correct these."),*I);
}
@@ -3210,6 +3232,7 @@ int main(int argc,const char *argv[])
{'v',"version","version",0},
{'V',"verbose-versions","APT::Get::Show-Versions",0},
{'q',"quiet","quiet",CommandLine::IntLevel},
+ { 0, "simple-output","simple-output",0},
{'q',"silent","quiet",CommandLine::IntLevel},
{'d',"download-only","APT::Get::Download-Only",0},
{'b',"compile","APT::Get::Compile",0},
@@ -3322,9 +3345,21 @@ int main(int argc,const char *argv[])
_config->Set("quiet","1");
// Setup the output streams
- c0out.rdbuf(cout.rdbuf());
- c1out.rdbuf(cout.rdbuf());
- c2out.rdbuf(cout.rdbuf());
+ if (_config->FindB("simple-output"))
+ {
+ c0out.rdbuf(devnull.rdbuf());
+ c1out.rdbuf(devnull.rdbuf());
+ c2out.rdbuf(devnull.rdbuf());
+ c3out.rdbuf(cout.rdbuf());
+ }
+ else
+ {
+ c0out.rdbuf(cout.rdbuf());
+ c1out.rdbuf(cout.rdbuf());
+ c2out.rdbuf(cout.rdbuf());
+ c3out.rdbuf(devnull.rdbuf());
+ }
+
if (_config->FindI("quiet",0) > 0)
c0out.rdbuf(devnull.rdbuf());
if (_config->FindI("quiet",0) > 1)

10
apt.spec
View File

@ -2,7 +2,7 @@
Name: apt
Version: 0.5.15lorg2
Release: alt5
Release: alt6
Summary: Debian's Advanced Packaging Tool with RPM support
Summary(ru_RU.KOI8-R): Debian APT - õÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÎÏÅ ÓÒÅÄÓÔ×Ï ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ Ó ÐÏÄÄÅÒÖËÏÊ RPM
@ -58,6 +58,8 @@ Patch44: apt-0.5.15lorg2-alt-apt-shell-resetconfig.patch
Patch45: apt-0.5.15lorg2-alt-pkgInitConfig-cpu.patch
Patch46: apt-0.5.15lorg2-alt-pkgCache-PrvIterator.patch
Patch47: apt-0.5.15lorg2-alt-realloc.patch
Patch48: apt-0.5.15lorg2-alt-apt-get-TryToInstall-PrvPkgCandVer.patch
Patch49: apt-0.5.15lorg2-alt-apt-get-simple-output.patch
# Normally not applied, but useful.
Patch101: apt-0.5.4cnc9-alt-getsrc-debug.patch
@ -260,6 +262,8 @@ This package contains method 'rsync' for APT.
%patch45 -p1
%patch46 -p1
%patch47 -p1
%patch48 -p1
%patch49 -p1
find -type f -name \*.orig -delete -print
@ -374,6 +378,10 @@ fi
# Probably %%doc with README.rsync?
%changelog
* Tue Oct 10 2006 Dmitry V. Levin <ldv@altlinux.org> 0.5.15lorg2-alt6
- apt-get: Fixed virtual packages handling (Alexey Tourbin).
- apt-get: Implemented simple-output option (Stanislav Ievlev).
* Thu Oct 05 2006 Dmitry V. Levin <ldv@altlinux.org> 0.5.15lorg2-alt5
- pkgCache::PrvIterator:
+ Add default constructor, required for aptitude 0.4.1 (Raorn, #9604).