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

Apply apt-0.5.15cnc6-alt-defaults.patch

Browse Source 
Added in commit 4ef124c:
0.5.5cnc4.1-alt7

- apt-pkg/rpm/rpmpm.cc(pkgRPMPM::ExecRPM): honor "quiet" option.
- Additional sorting hacks for virtual packages (mouse).
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-05-16 20:19:28 +04:00
parent 8276cdafe3
commit 2ee8510e8c
6 changed files with 10 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
apt-0.5.15cnc6-alt-defaults.patch
View File

@ -1,80 +0,0 @@
diff -upk.orig apt-0.5.15cnc6.orig/apt-pkg/rpm/rpmpackagedata.cc apt-0.5.15cnc6/apt-pkg/rpm/rpmpackagedata.cc
--- apt-0.5.15cnc6.orig/apt-pkg/rpm/rpmpackagedata.cc 2004-03-08 16:44:08 +0000
+++ apt-0.5.15cnc6/apt-pkg/rpm/rpmpackagedata.cc 2005-05-18 16:07:03 +0000
@@ -21,7 +21,7 @@ RPMPackageData::RPMPackageData()
#endif
{
// Populate priorities
- string FileName = _config->FindFile("Dir::Etc::rpmpriorities");
+ string FileName = _config->FindFile("Dir::Etc::pkgpriorities");
FileFd F(FileName, FileFd::ReadOnly);
if (_error->PendingError())
{
diff -upk.orig apt-0.5.15cnc6.orig/apt-pkg/rpm/rpmsystem.cc apt-0.5.15cnc6/apt-pkg/rpm/rpmsystem.cc
--- apt-0.5.15cnc6.orig/apt-pkg/rpm/rpmsystem.cc 2005-05-18 16:01:23 +0000
+++ apt-0.5.15cnc6/apt-pkg/rpm/rpmsystem.cc 2005-05-18 16:07:32 +0000
@@ -136,13 +136,13 @@
bool rpmSystem::Initialize(Configuration &Cnf)
{
Cnf.CndSet("Dir::Bin::rpm","/bin/rpm");
- Cnf.CndSet("Dir::Etc::rpmpriorities", "rpmpriorities");
+ Cnf.CndSet("Dir::Etc::pkgpriorities", "pkgpriorities");
Cnf.CndSet("Dir::Etc::translatelist", "translate.list");
Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d");
Cnf.CndSet("Dir::State::prefetch", "prefetch");
Cnf.CndSet("Dir::Locale","/usr/share/locale");
Cnf.CndSet("Acquire::DistroID","ALT Linux"); // hee hee
- Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
+ Cnf.CndSet("Acquire::CDROM::Mount", "/media/ALTLinux");
Cnf.CndSet("Acquire::CDROM::Copy-All", "true");
// Compatibility with obsoleted options
@@ -577,7 +577,7 @@
HashOptionTree(Hash, "RPM::Allow-Duplicated");
HashOptionTree(Hash, "RPM::MultiArch");
HashOptionTree(Hash, "RPM::Ignore");
- HashOptionFile(Hash, "Dir::Etc::rpmpriorities");
+ HashOptionFile(Hash, "Dir::Etc::pkgpriorities");
HashEnv(Hash, "LANG");
HashEnv(Hash, "LC_ALL");
HashEnv(Hash, "LC_MESSAGES");
diff -upk.orig apt-0.5.15cnc6.orig/buildlib/archtable apt-0.5.15cnc6/buildlib/archtable
--- apt-0.5.15cnc6.orig/buildlib/archtable 2003-04-14 17:15:31 +0000
+++ apt-0.5.15cnc6/buildlib/archtable 2005-05-18 16:07:03 +0000
@@ -5,8 +5,10 @@
# The left side is a regex for awk
-i.86 i386
-pentium i386
+i[34]86 i386
+i.86 i586
+pentium.* i586
+athlon i586
sparc sparc
sparc64 sparc
alpha.* alpha
diff -upk.orig apt-0.5.15lorg2.orig/cmdline/apt-get.cc apt-0.5.15lorg2/cmdline/apt-get.cc
--- apt-0.5.15lorg2.orig/cmdline/apt-get.cc 2006-01-17 18:41:29 +0000
+++ apt-0.5.15lorg2/cmdline/apt-get.cc 2006-04-01 16:26:19 +0000
@@ -1752,7 +1752,7 @@ bool DoUpdate(CommandLine &CmdL)
#endif
// CNC:2004-04-19
- if (Failed == false && _config->FindB("APT::Get::Archive-Cleanup",true) == true)
+ if (Failed == false && _config->FindB("APT::Get::Archive-Cleanup",false) == true)
{
UpdateLogCleaner Cleaner;
Cleaner.Go(_config->FindDir("Dir::Cache::archives"), *Cache);
diff -upk.orig apt-0.5.15lorg2.orig/cmdline/apt-shell.cc apt-0.5.15lorg2/cmdline/apt-shell.cc
--- apt-0.5.15lorg2.orig/cmdline/apt-shell.cc 2006-01-16 23:10:47 +0000
+++ apt-0.5.15lorg2/cmdline/apt-shell.cc 2006-04-01 16:26:29 +0000
@@ -1812,7 +1812,7 @@ bool DoUpdate(CommandLine &CmdL)
#endif
// CNC:2004-04-19
- if (Failed == false && _config->FindB("APT::Get::Archive-Cleanup",true) == true)
+ if (Failed == false && _config->FindB("APT::Get::Archive-Cleanup",false) == true)
{
UpdateLogCleaner Cleaner;
Cleaner.Go(_config->FindDir("Dir::Cache::archives"), *GCache);

2
apt/apt-pkg/rpm/rpmpackagedata.cc
View File

@ -39,7 +39,7 @@ RPMPackageData::RPMPackageData()
} }
// Populate priorities // Populate priorities
string FileName = _config->FindFile("Dir::Etc::rpmpriorities"); string FileName = _config->FindFile("Dir::Etc::pkgpriorities");
FileFd F(FileName, FileFd::ReadOnly); FileFd F(FileName, FileFd::ReadOnly);
if (_error->PendingError()) if (_error->PendingError())
{ {

6
apt/apt-pkg/rpm/rpmsystem.cc
View File

@ -136,13 +136,13 @@ pkgPackageManager *rpmSystem::CreatePM(pkgDepCache *Cache) const
bool rpmSystem::Initialize(Configuration &Cnf) bool rpmSystem::Initialize(Configuration &Cnf)
{ {
Cnf.CndSet("Dir::Bin::rpm","/bin/rpm"); Cnf.CndSet("Dir::Bin::rpm","/bin/rpm");
Cnf.CndSet("Dir::Etc::rpmpriorities", "rpmpriorities"); Cnf.CndSet("Dir::Etc::pkgpriorities", "pkgpriorities");
Cnf.CndSet("Dir::Etc::translatelist", "translate.list"); Cnf.CndSet("Dir::Etc::translatelist", "translate.list");
Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d"); Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d");
Cnf.CndSet("Dir::State::prefetch", "prefetch"); Cnf.CndSet("Dir::State::prefetch", "prefetch");
Cnf.CndSet("Dir::Locale","/usr/share/locale"); Cnf.CndSet("Dir::Locale","/usr/share/locale");
Cnf.CndSet("Acquire::DistroID","ALT Linux"); // hee hee Cnf.CndSet("Acquire::DistroID","ALT Linux"); // hee hee
Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom"); Cnf.CndSet("Acquire::CDROM::Mount", "/media/ALTLinux");
Cnf.CndSet("Acquire::CDROM::Copy-All", "true"); Cnf.CndSet("Acquire::CDROM::Copy-All", "true");
// Compatibility with obsoleted options // Compatibility with obsoleted options
@ -596,7 +596,7 @@ unsigned long rpmSystem::OptionsHash() const
HashOptionTree(Hash, "RPM::Allow-Duplicated"); HashOptionTree(Hash, "RPM::Allow-Duplicated");
HashOptionTree(Hash, "RPM::MultiArch"); HashOptionTree(Hash, "RPM::MultiArch");
HashOptionTree(Hash, "RPM::Ignore"); HashOptionTree(Hash, "RPM::Ignore");
HashOptionFile(Hash, "Dir::Etc::rpmpriorities"); HashOptionFile(Hash, "Dir::Etc::pkgpriorities");
HashEnv(Hash, "LANG"); HashEnv(Hash, "LANG");
HashEnv(Hash, "LC_ALL"); HashEnv(Hash, "LC_ALL");
HashEnv(Hash, "LC_MESSAGES"); HashEnv(Hash, "LC_MESSAGES");

6
apt/buildlib/archtable
View File

@ -5,8 +5,10 @@
# The left side is a regex for awk # The left side is a regex for awk
i.86 i386 i[34]86 i386
pentium i386 i.86 i586
pentium.* i586
athlon i586
sparc sparc sparc sparc
sparc64 sparc sparc64 sparc
alpha.* alpha alpha.* alpha

2
apt/cmdline/apt-get.cc
View File

@ -1755,7 +1755,7 @@ bool DoUpdate(CommandLine &CmdL)
#endif #endif
// CNC:2004-04-19 // CNC:2004-04-19
if (Failed == false && _config->FindB("APT::Get::Archive-Cleanup",true) == true) if (Failed == false && _config->FindB("APT::Get::Archive-Cleanup",false) == true)
{ {
UpdateLogCleaner Cleaner; UpdateLogCleaner Cleaner;
Cleaner.Go(_config->FindDir("Dir::Cache::archives"), *Cache); Cleaner.Go(_config->FindDir("Dir::Cache::archives"), *Cache);

2
apt/cmdline/apt-shell.cc
View File

@ -1809,7 +1809,7 @@ bool DoUpdate(CommandLine &CmdL)
#endif #endif
// CNC:2004-04-19 // CNC:2004-04-19
if (Failed == false && _config->FindB("APT::Get::Archive-Cleanup",true) == true) if (Failed == false && _config->FindB("APT::Get::Archive-Cleanup",false) == true)
{ {
UpdateLogCleaner Cleaner; UpdateLogCleaner Cleaner;
Cleaner.Go(_config->FindDir("Dir::Cache::archives"), *GCache); Cleaner.Go(_config->FindDir("Dir::Cache::archives"), *GCache);