Browse Source

reduce delta from ubuntu

debian/1.8.y
Michael Vogt 8 years ago
parent
commit
6c50447eb4
  1. 2
      apt-pkg/deb/dpkgpm.cc
  2. 1
      apt-pkg/init.cc
  3. 2
      debian/apt.conf.autoremove
  4. 2
      debian/apt.install.in
  5. 4
      ftparchive/override.cc

2
apt-pkg/deb/dpkgpm.cc

@ -1617,7 +1617,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
string::size_type pos;
FILE *report;
if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
if (_config->FindB("Dpkg::ApportFailureReport", true) == false)
{
std::clog << "configured to not write apport reports" << std::endl;
return;

1
apt-pkg/init.cc

@ -86,6 +86,7 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
// Default cdrom mount point
Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");

2
debian/apt.conf.autoremove

@ -22,6 +22,8 @@ APT
".*-modules";
".*-kernel";
"linux-backports-modules-.*";
# tools
"linux-tools";
};
Never-MarkAuto-Sections

2
debian/apt.install.in

@ -3,4 +3,4 @@ bin/apt-* usr/bin/
bin/methods/* usr/lib/apt/methods/
scripts/dselect/* usr/lib/dpkg/methods/apt/
usr/share/locale/*/*/apt.mo
bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/
bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/

4
ftparchive/override.cc

@ -37,7 +37,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
if (F == 0)
return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
char Line[500];
char Line[1000];
unsigned long long Counter = 0;
while (fgets(Line,sizeof(Line),F) != 0)
{
@ -141,7 +141,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/)
if (F == 0)
return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
char Line[500];
char Line[1000];
unsigned long long Counter = 0;
while (fgets(Line,sizeof(Line),F) != 0)
{

Loading…
Cancel
Save