#include <apt-private/private-cacheset.h>
#include <apt-private/private-cmndline.h>
+#include <apt-private/private-show.h>
+#include <apt-private/private-search.h>
#include <regex.h>
#include <stddef.h>
using namespace std;
-// LocalitySort - Sort a version list by package file locality /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static int LocalityCompare(const void *a, const void *b)
-{
- pkgCache::VerFile *A = *(pkgCache::VerFile **)a;
- pkgCache::VerFile *B = *(pkgCache::VerFile **)b;
-
- if (A == 0 && B == 0)
- return 0;
- if (A == 0)
- return 1;
- if (B == 0)
- return -1;
-
- if (A->File == B->File)
- return A->Offset - B->Offset;
- return A->File - B->File;
-}
-
-static void LocalitySort(pkgCache::VerFile **begin,
- unsigned long Count,size_t Size)
-{
- qsort(begin,Count,Size,LocalityCompare);
-}
-
-static void LocalitySort(pkgCache::DescFile **begin,
- unsigned long Count,size_t Size)
-{
- qsort(begin,Count,Size,LocalityCompare);
-}
- /*}}}*/
// UnMet - Show unmet dependencies /*{{{*/
// ---------------------------------------------------------------------
/* */
continue;
// Skip conflicts and replaces
- if (End.IsNegative() == true)
+ if (End.IsNegative() == true || End->Type == pkgCache::Dep::Replaces)
continue;
// Verify the or group
break;
}
delete [] VList;
-
+
if (Start == End)
break;
++Start;
{
cout << Cur.VerStr() << " - ";
for (pkgCache::PrvIterator Prv = Cur.ProvidesList(); Prv.end() != true; ++Prv)
- cout << Prv.ParentPkg().FullName(true) << " ";
+ cout << Prv.ParentPkg().FullName(true) << " (= " << (Prv->ProvideVersion == 0 ? "" : Prv.ProvideVersion()) << ") ";
cout << endl;
}
cout << "Reverse Provides: " << endl;
for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; ++Prv)
- cout << Prv.OwnerPkg().FullName(true) << " " << Prv.OwnerVer().VerStr() << endl;
+ cout << Prv.OwnerPkg().FullName(true) << " " << Prv.OwnerVer().VerStr() << " (= " << (Prv->ProvideVersion == 0 ? "" : Prv.ProvideVersion()) << ")"<< endl;
}
return true;
// ShowHashTableStats - Show stats about a hashtable /*{{{*/
// ---------------------------------------------------------------------
/* */
+static map_pointer_t PackageNext(pkgCache::Package const * const P) { return P->NextPackage; }
+static map_pointer_t GroupNext(pkgCache::Group const * const G) { return G->Next; }
template<class T>
static void ShowHashTableStats(std::string Type,
T *StartP,
map_pointer_t *Hashtable,
- unsigned long Size)
+ unsigned long Size,
+ map_pointer_t(*Next)(T const * const))
{
// hashtable stats for the HashTable
unsigned long NumBuckets = Size;
}
++UsedBuckets;
unsigned long ThisBucketSize = 0;
- for (; P != StartP; P = StartP + P->Next)
+ for (; P != StartP; P = StartP + Next(P))
++ThisBucketSize;
Entries += ThisBucketSize;
LongestBucket = std::max(ThisBucketSize, LongestBucket);
// Stats - Dump some nice statistics /*{{{*/
// ---------------------------------------------------------------------
/* */
-static bool Stats(CommandLine &)
+static bool Stats(CommandLine &CmdL)
{
+ if (CmdL.FileSize() > 1) {
+ _error->Error(_("apt-cache stats does not take any arguments"));
+ return false;
+ }
+
pkgCacheFile CacheFile;
pkgCache *Cache = CacheFile.GetPkgCache();
+
if (unlikely(Cache == NULL))
return false;
cout << _(" Single virtual packages: ") << DVirt << endl;
cout << _(" Mixed virtual packages: ") << NVirt << endl;
cout << _(" Missing: ") << Missing << endl;
-
+
cout << _("Total distinct versions: ") << Cache->Head().VersionCount << " (" <<
SizeToStr(Cache->Head().VersionCount*Cache->Head().VersionSz) << ')' << endl;
cout << _("Total distinct descriptions: ") << Cache->Head().DescriptionCount << " (" <<
SizeToStr(Cache->Head().DescriptionCount*Cache->Head().DescriptionSz) << ')' << endl;
- cout << _("Total dependencies: ") << Cache->Head().DependsCount << " (" <<
- SizeToStr(Cache->Head().DependsCount*Cache->Head().DependencySz) << ')' << endl;
-
+ cout << _("Total dependencies: ") << Cache->Head().DependsCount << "/" << Cache->Head().DependsDataCount << " (" <<
+ SizeToStr((Cache->Head().DependsCount*Cache->Head().DependencySz) +
+ (Cache->Head().DependsDataCount*Cache->Head().DependencyDataSz)) << ')' << endl;
cout << _("Total ver/file relations: ") << Cache->Head().VerFileCount << " (" <<
SizeToStr(Cache->Head().VerFileCount*Cache->Head().VerFileSz) << ')' << endl;
cout << _("Total Desc/File relations: ") << Cache->Head().DescFileCount << " (" <<
stritems.insert(Prv->ProvideVersion);
}
}
- for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
+ for (pkgCache::RlsFileIterator F = Cache->RlsFileBegin(); F != Cache->RlsFileEnd(); ++F)
{
stritems.insert(F->FileName);
stritems.insert(F->Archive);
stritems.insert(F->Codename);
- stritems.insert(F->Component);
stritems.insert(F->Version);
stritems.insert(F->Origin);
stritems.insert(F->Label);
- stritems.insert(F->Architecture);
stritems.insert(F->Site);
+ }
+ for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
+ {
+ stritems.insert(F->FileName);
+ stritems.insert(F->Architecture);
+ stritems.insert(F->Component);
stritems.insert(F->IndexType);
}
+
unsigned long Size = 0;
for (std::set<map_stringitem_t>::const_iterator i = stritems.begin(); i != stritems.end(); ++i)
Size += strlen(Cache->StrP + *i) + 1;
-
cout << _("Total globbed strings: ") << stritems.size() << " (" << SizeToStr(Size) << ')' << endl;
stritems.clear();
APT_CACHESIZE(VersionCount, VersionSz) +
APT_CACHESIZE(DescriptionCount, DescriptionSz) +
APT_CACHESIZE(DependsCount, DependencySz) +
+ APT_CACHESIZE(DependsDataCount, DependencyDataSz) +
+ APT_CACHESIZE(ReleaseFileCount, ReleaseFileSz) +
APT_CACHESIZE(PackageFileCount, PackageFileSz) +
APT_CACHESIZE(VerFileCount, VerFileSz) +
APT_CACHESIZE(DescFileCount, DescFileSz) +
APT_CACHESIZE(ProvidesCount, ProvidesSz) +
- (2 * Cache->Head().HashTableSize * sizeof(map_id_t));
+ (2 * Cache->Head().GetHashTableSize() * sizeof(map_id_t));
cout << _("Total space accounted for: ") << SizeToStr(Total) << endl;
#undef APT_CACHESIZE
// hashtable stats
- ShowHashTableStats<pkgCache::Package>("PkgHashTable", Cache->PkgP, Cache->Head().PkgHashTable(), Cache->Head().HashTableSize);
- ShowHashTableStats<pkgCache::Group>("GrpHashTable", Cache->GrpP, Cache->Head().GrpHashTable(), Cache->Head().HashTableSize);
+ ShowHashTableStats<pkgCache::Package>("PkgHashTable", Cache->PkgP, Cache->Head().PkgHashTableP(), Cache->Head().GetHashTableSize(), PackageNext);
+ ShowHashTableStats<pkgCache::Group>("GrpHashTable", Cache->GrpP, Cache->Head().GrpHashTableP(), Cache->Head().GetHashTableSize(), GroupNext);
return true;
}
LocalitySort(VFList,Count,sizeof(*VFList));
+ std::vector<pkgTagSection::Tag> RW;
+ RW.push_back(pkgTagSection::Tag::Remove("Status"));
+ RW.push_back(pkgTagSection::Tag::Remove("Config-Version"));
+ FileFd stdoutfd;
+ stdoutfd.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, false);
+
// Iterate over all the package files and write them out.
char *Buffer = new char[Cache->HeaderP->MaxVerFileSize+10];
for (pkgCache::VerFile **J = VFList; *J != 0;)
if (PkgF.Read(Buffer,VF.Size + Jitter) == false)
break;
Buffer[VF.Size + Jitter] = '\n';
-
+
// See above..
if ((File->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
{
pkgTagSection Tags;
- TFRewriteData RW[] = {{"Status", NULL, NULL},{"Config-Version", NULL, NULL},{NULL, NULL, NULL}};
- const char *Zero = 0;
if (Tags.Scan(Buffer+Jitter,VF.Size+1) == false ||
- TFRewrite(stdout,Tags,&Zero,RW) == false)
+ Tags.Write(stdoutfd, NULL, RW) == false ||
+ stdoutfd.Write("\n", 1) == false)
{
_error->Error("Internal Error, Unable to parse a package record");
break;
}
- fputc('\n',stdout);
}
else
{
- if (fwrite(Buffer+Jitter,VF.Size+1,1,stdout) != 1)
+ if (stdoutfd.Write(Buffer + Jitter, VF.Size + 1) == false)
break;
}
-
+
Pos = VF.Offset + VF.Size;
}
- fflush(stdout);
if (_error->PendingError() == true)
break;
}
-
+
delete [] Buffer;
delete [] VFList;
return !_error->PendingError();
bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false);
bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false);
bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false);
+ bool const ShowImplicit = _config->FindB("APT::Cache::ShowImplicit", false);
while (verset.empty() != true)
{
case pkgCache::Dep::Depends: if (!ShowDepends) continue; break;
case pkgCache::Dep::Recommends: if (!ShowRecommends) continue; break;
case pkgCache::Dep::Suggests: if (!ShowSuggests) continue; break;
- case pkgCache::Dep::Replaces: if (!ShowReplaces) continue; break; case pkgCache::Dep::Conflicts: if (!ShowConflicts) continue; break;
+ case pkgCache::Dep::Replaces: if (!ShowReplaces) continue; break;
+ case pkgCache::Dep::Conflicts: if (!ShowConflicts) continue; break;
case pkgCache::Dep::DpkgBreaks: if (!ShowBreaks) continue; break;
case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break;
}
+ if (ShowImplicit == false && D.IsImplicit())
+ continue;
pkgCache::PkgIterator Trg = RevDepends ? D.ParentPkg() : D.TargetPkg();
}
// Display all solutions
- SPtrArray<pkgCache::Version *> List = D.AllTargets();
- pkgPrioSortList(*Cache,List);
- for (pkgCache::Version **I = List; *I != 0; I++)
+ std::unique_ptr<pkgCache::Version *[]> List(D.AllTargets());
+ pkgPrioSortList(*Cache,List.get());
+ for (pkgCache::Version **I = List.get(); *I != 0; I++)
{
pkgCache::VerIterator V(*Cache,*I);
if (V != Cache->VerP + V.ParentPkg()->VersionList ||
return true;
}
/*}}}*/
-// DisplayRecord - Displays the complete record for the package /*{{{*/
-// ---------------------------------------------------------------------
-/* This displays the package record from the proper package index file.
- It is not used by DumpAvail for performance reasons. */
-
-static APT_PURE unsigned char const* skipDescriptionFields(unsigned char const * DescP)
-{
- char const * const TagName = "\nDescription";
- size_t const TagLen = strlen(TagName);
- while ((DescP = (unsigned char*)strchr((char*)DescP, '\n')) != NULL)
- {
- if (DescP[1] == ' ')
- DescP += 2;
- else if (strncmp((char*)DescP, TagName, TagLen) == 0)
- DescP += TagLen;
- else
- break;
- }
- if (DescP != NULL)
- ++DescP;
- return DescP;
-}
-static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
-{
- pkgCache *Cache = CacheFile.GetPkgCache();
- if (unlikely(Cache == NULL))
- return false;
-
- // Find an appropriate file
- pkgCache::VerFileIterator Vf = V.FileList();
- for (; Vf.end() == false; ++Vf)
- if ((Vf.File()->Flags & pkgCache::Flag::NotSource) == 0)
- break;
- if (Vf.end() == true)
- Vf = V.FileList();
-
- // Check and load the package list file
- pkgCache::PkgFileIterator I = Vf.File();
- if (I.IsOk() == false)
- return _error->Error(_("Package file %s is out of sync."),I.FileName());
-
- FileFd PkgF;
- if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false)
- return false;
-
- // Read the record (and ensure that it ends with a newline and NUL)
- unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+2];
- Buffer[Vf->Size] = '\n';
- Buffer[Vf->Size+1] = '\0';
- if (PkgF.Seek(Vf->Offset) == false ||
- PkgF.Read(Buffer,Vf->Size) == false)
- {
- delete [] Buffer;
- return false;
- }
-
- // Get a pointer to start of Description field
- const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "\nDescription");
- if (DescP != NULL)
- ++DescP;
- else
- DescP = Buffer + Vf->Size;
-
- // Write all but Description
- size_t const length = DescP - Buffer;
- if (length != 0 && FileFd::Write(STDOUT_FILENO, Buffer, length) == false)
- {
- delete [] Buffer;
- return false;
- }
-
- // Show the right description
- pkgRecords Recs(*Cache);
- pkgCache::DescIterator Desc = V.TranslatedDescription();
- if (Desc.end() == false)
- {
- pkgRecords::Parser &P = Recs.Lookup(Desc.FileList());
- cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc();
- cout << std::endl << "Description-md5: " << Desc.md5() << std::endl;
-
- // Find the first field after the description (if there is any)
- DescP = skipDescriptionFields(DescP);
- }
- // else we have no translation, so we found a lonely Description-md5 -> don't skip it
-
- // write the rest of the buffer, but skip mixed in Descriptions* fields
- while (DescP != NULL)
- {
- const unsigned char * const Start = DescP;
- const unsigned char *End = (unsigned char*)strstr((char*)DescP, "\nDescription");
- if (End == NULL)
- {
- End = &Buffer[Vf->Size];
- DescP = NULL;
- }
- else
- {
- ++End; // get the newline into the output
- DescP = skipDescriptionFields(End + strlen("Description"));
- }
- size_t const length = End - Start;
- if (length != 0 && FileFd::Write(STDOUT_FILENO, Start, length) == false)
- {
- delete [] Buffer;
- return false;
- }
- }
-
- // write a final newline after the last field
- cout<<endl;
-
- delete [] Buffer;
- return true;
-}
- /*}}}*/
-struct ExDescFile
-{
- pkgCache::DescFile *Df;
- map_id_t ID;
-};
-
-// Search - Perform a search /*{{{*/
-// ---------------------------------------------------------------------
-/* This searches the package names and package descriptions for a pattern */
-static bool Search(CommandLine &CmdL)
-{
- bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false);
- bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false);
- unsigned int const NumPatterns = CmdL.FileSize() -1;
-
- pkgCacheFile CacheFile;
- pkgCache *Cache = CacheFile.GetPkgCache();
- pkgDepCache::Policy *Plcy = CacheFile.GetPolicy();
- if (unlikely(Cache == NULL || Plcy == NULL))
- return false;
-
- // Make sure there is at least one argument
- if (NumPatterns < 1)
- return _error->Error(_("You must give at least one search pattern"));
-
- // Compile the regex pattern
- regex_t *Patterns = new regex_t[NumPatterns];
- memset(Patterns,0,sizeof(*Patterns)*NumPatterns);
- for (unsigned I = 0; I != NumPatterns; I++)
- {
- if (regcomp(&Patterns[I],CmdL.FileList[I+1],REG_EXTENDED | REG_ICASE |
- REG_NOSUB) != 0)
- {
- for (; I != 0; I--)
- regfree(&Patterns[I]);
- return _error->Error("Regex compilation error");
- }
- }
-
- if (_error->PendingError() == true)
- {
- for (unsigned I = 0; I != NumPatterns; I++)
- regfree(&Patterns[I]);
- return false;
- }
-
- size_t const descCount = Cache->HeaderP->GroupCount + 1;
- ExDescFile *DFList = new ExDescFile[descCount];
- memset(DFList,0,sizeof(*DFList) * descCount);
-
- bool *PatternMatch = new bool[descCount * NumPatterns];
- memset(PatternMatch,false,sizeof(*PatternMatch) * descCount * NumPatterns);
-
- // Map versions that we want to write out onto the VerList array.
- for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G)
- {
- size_t const PatternOffset = G->ID * NumPatterns;
- size_t unmatched = 0, matched = 0;
- for (unsigned I = 0; I < NumPatterns; ++I)
- {
- if (PatternMatch[PatternOffset + I] == true)
- ++matched;
- else if (regexec(&Patterns[I],G.Name(),0,0,0) == 0)
- PatternMatch[PatternOffset + I] = true;
- else
- ++unmatched;
- }
-
- // already dealt with this package?
- if (matched == NumPatterns)
- continue;
-
- // Doing names only, drop any that don't match..
- if (NamesOnly == true && unmatched == NumPatterns)
- continue;
-
- // Find the proper version to use
- pkgCache::PkgIterator P = G.FindPreferredPkg();
- if (P.end() == true)
- continue;
- pkgCache::VerIterator V = Plcy->GetCandidateVer(P);
- if (V.end() == false)
- {
- pkgCache::DescIterator const D = V.TranslatedDescription();
- //FIXME: packages without a description can't be found
- if (D.end() == true)
- continue;
- DFList[G->ID].Df = D.FileList();
- DFList[G->ID].ID = G->ID;
- }
-
- if (unmatched == NumPatterns)
- continue;
-
- // Include all the packages that provide matching names too
- for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; ++Prv)
- {
- pkgCache::VerIterator V = Plcy->GetCandidateVer(Prv.OwnerPkg());
- if (V.end() == true)
- continue;
-
- unsigned long id = Prv.OwnerPkg().Group()->ID;
- pkgCache::DescIterator const D = V.TranslatedDescription();
- //FIXME: packages without a description can't be found
- if (D.end() == true)
- continue;
- DFList[id].Df = D.FileList();
- DFList[id].ID = id;
-
- size_t const PrvPatternOffset = id * NumPatterns;
- for (unsigned I = 0; I < NumPatterns; ++I)
- PatternMatch[PrvPatternOffset + I] = PatternMatch[PatternOffset + I];
- }
- }
-
- LocalitySort(&DFList->Df,Cache->HeaderP->GroupCount,sizeof(*DFList));
-
- // Create the text record parser
- pkgRecords Recs(*Cache);
- // Iterate over all the version records and check them
- for (ExDescFile *J = DFList; J->Df != 0; ++J)
- {
- pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df));
- size_t const PatternOffset = J->ID * NumPatterns;
-
- if (NamesOnly == false)
- {
- string const LongDesc = P.LongDesc();
- for (unsigned I = 0; I < NumPatterns; ++I)
- {
- if (PatternMatch[PatternOffset + I] == true)
- continue;
- else if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0)
- PatternMatch[PatternOffset + I] = true;
- }
- }
-
- bool matchedAll = true;
- for (unsigned I = 0; I < NumPatterns; ++I)
- if (PatternMatch[PatternOffset + I] == false)
- {
- matchedAll = false;
- break;
- }
-
- if (matchedAll == true)
- {
- if (ShowFull == true)
- {
- const char *Start;
- const char *End;
- P.GetRec(Start,End);
- fwrite(Start,End-Start,1,stdout);
- putc('\n',stdout);
- }
- else
- printf("%s - %s\n",P.Name().c_str(),P.ShortDesc().c_str());
- }
- }
-
- delete [] DFList;
- delete [] PatternMatch;
- for (unsigned I = 0; I != NumPatterns; I++)
- regfree(&Patterns[I]);
- if (ferror(stdout))
- return _error->Error("Write to stdout failed");
- return true;
-}
- /*}}}*/
/* ShowAuto - show automatically installed packages (sorted) {{{*/
static bool ShowAuto(CommandLine &)
{
return true;
}
/*}}}*/
-// ShowPackage - Dump the package record to the screen /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowPackage(CommandLine &CmdL)
-{
- pkgCacheFile CacheFile;
- CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
- APT::CacheSetHelper::VerSelector const select = _config->FindB("APT::Cache::AllVersions", true) ?
- APT::CacheSetHelper::ALL : APT::CacheSetHelper::CANDIDATE;
- APT::VersionList const verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper);
- for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver)
- if (DisplayRecord(CacheFile, Ver) == false)
- return false;
-
- if (verset.empty() == true)
- {
- if (helper.virtualPkgs.empty() == true)
- return _error->Error(_("No packages found"));
- else
- _error->Notice(_("No packages found"));
- }
- return true;
-}
- /*}}}*/
// ShowPkgNames - Show package names /*{{{*/
// ---------------------------------------------------------------------
/* This does a prefix match on the first argument */
pkgSrcRecords::Parser *Parse;
unsigned found_this = 0;
while ((Parse = SrcRecs.Find(*I,false)) != 0) {
+ // SrcRecs.Find() will find both binary and source names
+ if (_config->FindB("APT::Cache::Only-Source", false) == true)
+ if (Parse->Package() != *I)
+ continue;
cout << Parse->AsStr() << endl;;
found++;
found_this++;
cout << _("Package files:") << endl;
for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F.end() == false; ++F)
{
+ if (F.Flagged(pkgCache::Flag::NoPackages))
+ continue;
// Locate the associated index files so we can derive a description
pkgIndexFile *Indx;
if (SrcList->FindIndex(F,Indx) == false &&
pkgCache::PkgIterator I = Cache->PkgBegin();
for (;I.end() != true; ++I)
{
- if (Plcy->GetPriority(I) == 0)
+ // Old code for debugging
+ if (_config->FindI("APT::Policy", 1) < 1) {
+ if (Plcy->GetPriority(I) == 0)
+ continue;
+
+ // Print the package name and the version we are forcing to
+ cout << " " << I.FullName(true) << " -> ";
+
+ pkgCache::VerIterator V = Plcy->GetMatch(I);
+ if (V.end() == true)
+ cout << _("(not found)") << endl;
+ else
+ cout << V.VerStr() << endl;
+
continue;
+ }
+ // New code
+ for (pkgCache::VerIterator V = I.VersionList(); !V.end(); V++) {
+ auto Prio = Plcy->GetPriority(V, false);
+ if (Prio == 0)
+ continue;
- // Print the package name and the version we are forcing to
- cout << " " << I.FullName(true) << " -> ";
-
- pkgCache::VerIterator V = Plcy->GetMatch(I);
- if (V.end() == true)
- cout << _("(not found)") << endl;
- else
- cout << V.VerStr() << endl;
- }
-
+ cout << " ";
+ // Print the package name and the version we are forcing to
+ ioprintf(cout, _("%s -> %s with priority %d\n"), I.FullName(true).c_str(), V.VerStr(), Prio);
+ }
+ }
return true;
}
cout << V.VerStr() << endl;
// Pinned version
- if (Plcy->GetPriority(Pkg) != 0)
+ if (_config->FindI("APT::Policy", 1) < 1 && Plcy->GetPriority(Pkg) != 0)
{
cout << _(" Package pin: ");
V = Plcy->GetMatch(Pkg);
cout << " *** " << V.VerStr();
else
cout << " " << V.VerStr();
- cout << " " << Plcy->GetPriority(Pkg) << endl;
+ if (_config->FindI("APT::Policy", 1) < 1)
+ cout << " " << Plcy->GetPriority(Pkg) << endl;
+ else
+ cout << " " << Plcy->GetPriority(V) << endl;
for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; ++VF)
{
// Locate the associated index files so we can derive a description
/* */
static bool ShowHelp(CommandLine &)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
-
+ ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+
if (_config->FindB("version") == true)
return true;
{"dump",&Dump},
{"dumpavail",&DumpAvail},
{"unmet",&UnMet},
- {"search",&Search},
+ {"search",&DoSearch},
{"depends",&Depends},
{"rdepends",&RDepends},
{"dotty",&Dotty},
textdomain(PACKAGE);
// Parse the command line and initialize the package library
- CommandLine CmdL(Args.data(),_config);
- if (pkgInitConfig(*_config) == false ||
- CmdL.Parse(argc,argv) == false ||
- pkgInitSystem(*_config,_system) == false)
- {
- _error->DumpErrors();
- return 100;
- }
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
- // See if the help should be shown
- if (_config->FindB("help") == true ||
- CmdL.FileSize() == 0)
- {
- ShowHelp(CmdL);
- return 0;
- }
-
- // Deal with stdout not being a tty
- if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
- _config->Set("quiet","1");
+ InitOutput();
if (_config->Exists("APT::Cache::Generate") == true)
_config->Set("pkgCacheFile::Generate", _config->FindB("APT::Cache::Generate", true));
projects / apt.git / blobdiff