X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftar.cpp;h=532b4a73f2ffdb23c553fce21cb1e8f8f8597370;hb=654de39b62a9a58fd8e1b5a557361d628345788b;hp=0b0c38df775696fcf1e98d8333a3357df68af305;hpb=555190f7eafcf3a67750fc63872b23e17371aa98;p=builder.git

diff --git a/source/tar.cpp b/source/tar.cpp
index 0b0c38d..532b4a7 100644
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #include <iostream>
 #include <msp/path/utils.h>
 #include "builder.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "tar.h"
 #include "tarball.h"
 
@@ -16,47 +16,21 @@ using namespace std;
 using namespace Msp;
 
 Tar::Tar(Builder &b, const TarBall &t):
-	Action(b),
-	tarball(t),
-	worker(0)
+	InternalAction(b),
+	tarball(t)
 {
 	string basename=tarball.get_name().substr(tarball.get_name().rfind('/')+1);
 	announce(tarball.get_package()->get_name(), "TAR ", basename);
 	if(builder.get_verbose()>=2)
 		cout<<"Create "<<basename<<'\n';
-	
+
 	if(!builder.get_dry_run())
 		worker=new Worker(*this);
 }
 
-Tar::~Tar()
-{
-	delete worker;
-}
-
-int Tar::check()
-{
-	if(!worker)  // True for dry run
-	{
-		signal_done.emit();
-		return 0;
-	}
-	
-	if(worker->get_done())
-	{
-		signal_done.emit();
-		worker->join();
-		return worker->get_error()?1:0;
-	}
-	
-	return -1;
-}
-
 
 Tar::Worker::Worker(Tar &t):
-	tar(t),
-	done(false),
-	error(false)
+	tar(t)
 {
 	launch();
 }