summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp41
1 files changed, 32 insertions, 9 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 02998f0..618ce24 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,4 +1,10 @@
1
1#include "backuprestore.h" 2#include "backuprestore.h"
3#include "output.h"
4
5#include <qapplication.h>
6#include <qmultilineedit.h>
7
2#include <qdir.h> 8#include <qdir.h>
3#include <qfile.h> 9#include <qfile.h>
4#include <qfileinfo.h> 10#include <qfileinfo.h>
@@ -13,6 +19,12 @@
13#include <stdlib.h> 19#include <stdlib.h>
14#include <qregexp.h> 20#include <qregexp.h>
15 21
22#include <errno.h>
23#include <stdlib.h>
24#include <unistd.h>
25#include <sys/stat.h>
26#include <dirent.h>
27
16#define HEADER_NAME 0 28#define HEADER_NAME 0
17#define HEADER_BACKUP 1 29#define HEADER_BACKUP 1
18#define BACKUP_LOCATION 2 30#define BACKUP_LOCATION 2
@@ -165,6 +177,7 @@ void BackupAndRestore::backupPressed(){
165 return; 177 return;
166 } 178 }
167 179
180 setCaption(tr("Backup and Restore... working..."));
168 QString outputFile = backupLocations[storeToLocation->currentText()]; 181 QString outputFile = backupLocations[storeToLocation->currentText()];
169 182
170 QDateTime time = QDateTime::currentDateTime(); 183 QDateTime time = QDateTime::currentDateTime();
@@ -177,16 +190,26 @@ void BackupAndRestore::backupPressed(){
177 outputFile = t + QString("%1").arg(c); 190 outputFile = t + QString("%1").arg(c);
178 c++; 191 c++;
179 } 192 }
193
194 qDebug(QString("system(\"tar -c %1 | gzip > %2\")").arg(backupFiles).arg(outputFile).latin1());
180 outputFile += EXTENSION; 195 outputFile += EXTENSION;
181 qDebug("system(\"tar -c %1 | gzip > %2\").arg(backupFiles).arg(outputFile).latin1())"); 196
182 int r = system(QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() ); 197 int r = system( QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() );
183 if(r != 0){ 198
184 QMessageBox::critical(this, "Message", "Backup Failed.",QString("Ok") ); 199
185 return; 200
186 } 201 if(r != 0){
187 else{ 202 perror("Error: ");
188 QMessageBox::critical(this, "Message", "Backup Successfull.",QString("Ok") ); 203 QString errorMsg="Error\n"+(QString)strerror(errno);
189 } 204
205 QMessageBox::critical(this, "Message", "Backup Failed.\n"+errorMsg, QString("Ok") );
206 return;
207 }
208 else{
209 QMessageBox::critical(this, "Message", "Backup Successfull.",QString("Ok") );
210
211 }
212 setCaption(tr("Backup and Restore"));
190} 213}
191 214
192/*** 215/***