Merge pull request #1 from aschnell/master

- don't use snapper factory
yast · Aug 30, 2012 · 30935b4 · 30935b4
2 parents 1e35847 + e822b56
commit 30935b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/agent-snapper/src/SnapperAgent.cc b/agent-snapper/src/SnapperAgent.cc
@@ -99,7 +99,8 @@ SnapperAgent::~SnapperAgent()
 {
     if (sh)
     {
-	deleteSnapper(sh);
+	delete sh;
+	sh = 0;
     }
 }
 
@@ -344,11 +345,13 @@ YCPValue SnapperAgent::Execute(const YCPPath &path, const YCPValue& arg,
 	if (sh)
 	{
 	    y2milestone ("deleting existing snapper object");
-	    deleteSnapper(sh);
+	    delete sh;
+	    sh = 0;
 	}
 	string config_name = getValue (argmap, YCPString ("config"), "root");
-	try {
-	    sh = createSnapper (config_name);
+	try
+	{
+	    sh = new Snapper(config_name);
 	}
 	catch (const ConfigNotFoundException& e)
 	{

diff --git a/agent-snapper/src/SnapperAgent.h b/agent-snapper/src/SnapperAgent.h
@@ -14,7 +14,6 @@
 #include <scr/SCRAgent.h>
 
 #include <snapper/Snapper.h>
-#include <snapper/Factory.h>
 #include <snapper/Snapshot.h>
 #include <snapper/Comparison.h>
 #include <snapper/File.h>