Browse Source

* apt-pkg/contrib/fileutl.cc:

- show notice about ignored file instead of being always silent
  - add a Dir::Ignore-Files-Silently list option to control the notice
*
tags/debian/0.8.0
David Kalnischkies 11 years ago
parent
commit
1408e219e7
4 changed files with 23 additions and 1 deletions
  1. +4
    -0
      apt-pkg/contrib/fileutl.cc
  2. +5
    -0
      apt-pkg/init.cc
  3. +5
    -1
      debian/changelog
  4. +9
    -0
      doc/apt.conf.5.xml

+ 4
- 0
apt-pkg/contrib/fileutl.cc View File

@@ -281,6 +281,7 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
}

std::vector<string> List;
Configuration::MatchAgainstConfig SilentIgnore("Dir::Ignore-Files-Silently");
DIR *D = opendir(Dir.c_str());
if (D == 0)
{
@@ -306,6 +307,7 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
{
if (Debug == true)
std::clog << "Bad file: " << Ent->d_name << " → no extension" << std::endl;
_error->Notice("Ignoring file '%s' in directory '%s' as it has no filename extension", Ent->d_name, Dir.c_str());
continue;
}
}
@@ -313,6 +315,8 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
{
if (Debug == true)
std::clog << "Bad file: " << Ent->d_name << " → bad extension »" << flExtension(Ent->d_name) << "«" << std::endl;
if (SilentIgnore.Match(Ent->d_name) == false)
_error->Notice("Ignoring file '%s' in directory '%s' as it has an invalid filename extension", Ent->d_name, Dir.c_str());
continue;
}
}


+ 5
- 0
apt-pkg/init.cc View File

@@ -78,6 +78,11 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Log::Terminal","term.log");
Cnf.Set("Dir::Log::History","history.log");

Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");

// Translation
Cnf.Set("APT::Acquire::Translation", "environment");



+ 5
- 1
debian/changelog View File

@@ -25,8 +25,12 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low
- show a deprecation notice for APT::Acquire::Translation
* apt-pkg/contrib/configuration.{cc,h}:
- add a wrapper to match strings against configurable regex patterns
* apt-pkg/contrib/fileutl.cc:
- show notice about ignored file instead of being always silent
- add a Dir::Ignore-Files-Silently list option to control the notice
*

-- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 13:28:48 +0200
-- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 18:40:01 +0200

apt (0.7.26~exp7) experimental; urgency=low



+ 9
- 0
doc/apt.conf.5.xml View File

@@ -507,6 +507,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
will be looked up in
<filename>/tmp/staging/var/lib/dpkg/status</filename>.
</para>

<para>
The <literal>Ignore-Files-Silently</literal> list can be used to specify
which files APT should silently ignore while parsing the files in the
fragment directories. Per default a file which end with <literal>.disabled</literal>,
<literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-z]+</literal>
is silently ignored. As seen in the last default value these patterns can use regular
expression syntax.
</para>
</refsect1>
<refsect1><title>APT in DSelect</title>


Loading…
Cancel
Save