- allow to disable filters

diff --git a/snapper/Factory.cc b/snapper/Factory.cc
index 6947659a201999609f6038fc7005285ad7a45e84..9c9662c7b4c6b313d1340547e41cf0ff45913b86 100644 (file)
--- a/snapper/Factory.cc
+++ b/snapper/Factory.cc
@@ -22,6 +22,7 @@
 
 #include "auto_ptr.h"
 
+#include "snapper/Factory.h"
 #include "snapper/Snapper.h"
 #include "snapper/Exception.h"
 
@@ -33,12 +34,12 @@ namespace snapper
 
 
     Snapper*
-    createSnapper(const string& config_name)
+    createSnapper(const string& config_name, bool disable_filters)
     {
        if (the_one.get())
            throw LogicErrorException();
 
-       the_one.reset(new Snapper(config_name));
+       the_one.reset(new Snapper(config_name, disable_filters));
        return the_one.get();
     }
 

diff --git a/snapper/Factory.h b/snapper/Factory.h
index 00f4abf32f2fa9acf6159775e1dd3b4557df2a60..64e3270ef33b76a12b8bf33e0404d819604dd155 100644 (file)
--- a/snapper/Factory.h
+++ b/snapper/Factory.h
@@ -37,7 +37,7 @@ namespace snapper
 
     // Only one Snapper can be created at a time.
 
-    Snapper* createSnapper(const string& config_name = "root");
+    Snapper* createSnapper(const string& config_name = "root", bool disable_filters = false);
 
     void deleteSnapper(Snapper*);
 

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index 4b76766be55ba2a3cdb86ab989d2e41dfad15670..2a3842ed6280b35697cd2994ea0e703b0a6aad25 100644 (file)
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -45,13 +45,13 @@ namespace snapper
     using namespace std;
 
 
-    Snapper::Snapper(const string& config_name)
+    Snapper::Snapper(const string& config_name, bool disable_filters)
        : config_name(config_name), config(NULL), subvolume("/"), snapshots(this),
          compare_callback(NULL), rollback_callback(NULL)
     {
        y2mil("Snapper constructor");
        y2mil("libsnapper version " VERSION);
-       y2mil("config_name:" << config_name);
+       y2mil("config_name:" << config_name << " disable_filters:" << disable_filters);
 
        try
        {
@@ -69,7 +69,8 @@ namespace snapper
 
        y2mil("subvolume:" << subvolume);
 
-       loadIgnorePatterns();
+       if (!disable_filters)
+           loadIgnorePatterns();
 
        snapshots.initialize();
     }

diff --git a/snapper/Snapper.h b/snapper/Snapper.h
index 60a731b8779d4994b3ad420476f6b2350d4c8e78..53b4334377cb6d9c4461c52cea8267b07da114be 100644 (file)
--- a/snapper/Snapper.h
+++ b/snapper/Snapper.h
@@ -105,7 +105,7 @@ namespace snapper
     {
     public:
 
-       Snapper(const string& config_name = "root");
+       Snapper(const string& config_name = "root", bool disable_filters = false);
        ~Snapper();
 
        string subvolumeDir() const;

diff --git a/tools/snapper.cc b/tools/snapper.cc
index 57aa794099ca0f93464b16a186cf9bf50bab9704..fcae26e89466f81465745cd5c68df4d439b29dfc 100644 (file)
--- a/tools/snapper.cc
+++ b/tools/snapper.cc
@@ -30,6 +30,7 @@ GetOpts getopts;
 bool quiet = false;
 bool verbose = false;
 string config_name = "root";
+bool disable_filters = false;
 
 Snapper* sh = NULL;
 
@@ -682,6 +683,7 @@ command_help()
         << _("\t--verbose, -v\t\t\tIncrease verbosity.") << endl
         << _("\t--table-style, -t <style>\tTable style (integer).") << endl
         << _("\t--config, -c <name>\t\tSet name of config to use.") << endl
+        << _("\t--disable-filters\t\tDisable filters.") << endl
         << _("\t--version\t\t\tPrint version and exit.") << endl
         << endl;
 
@@ -752,6 +754,7 @@ main(int argc, char** argv)
        { "verbose",            no_argument,            0,      'v' },
        { "table-style",        required_argument,      0,      't' },
        { "config",             required_argument,      0,      'c' },
+       { "disable-filters",    no_argument,            0,      0 },
        { "version",            no_argument,            0,      0 },
        { 0, 0, 0, 0 }
     };
@@ -784,6 +787,9 @@ main(int argc, char** argv)
     if ((opt = opts.find("config")) != opts.end())
        config_name = opt->second;
 
+    if ((opt = opts.find("disable-filters")) != opts.end())
+       disable_filters = true;
+
     if ((opt = opts.find("version")) != opts.end())
     {
        cout << "snapper " << VERSION << endl;
@@ -814,7 +820,7 @@ main(int argc, char** argv)
     {
        try
        {
-           sh = createSnapper(config_name);
+           sh = createSnapper(config_name, disable_filters);
        }
        catch (const ConfigNotFoundException& e)
        {