From be92c41bb1adab97f25f358854b32aea8f3945b3 Mon Sep 17 00:00:00 2001 From: Konrad Rosenbaum Date: Fri, 13 Jan 2017 22:26:46 +0100 Subject: [PATCH] always create meta file, more details on unzip errors Change-Id: I987d74b7dd2188eea516ce324e950096cdc0ea8d --- aurora/dloader/unzipper.cpp | 10 ++++++++-- aurora/instgen/zipgen.cpp | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/aurora/dloader/unzipper.cpp b/aurora/dloader/unzipper.cpp index e659088..f1df246 100644 --- a/aurora/dloader/unzipper.cpp +++ b/aurora/dloader/unzipper.cpp @@ -44,7 +44,10 @@ void UnZipper::close() bool UnZipper::unpackAll(const QString&path) { - if(!mzip.isOpen())return false; + if(!mzip.isOpen()){ + qWarning()<<"Zip file is not open while trying to unpack files!"; + return false; + } //go to start if(!mzip.firstFile().isValid()){ qWarning()<<"Zip file does not seem to contain files."; @@ -95,7 +98,10 @@ bool UnZipper::unpackAll(const QString&path) void UnZipper::readMetaFile() { //only if we have a ZIP - if(!mzip.isOpen())return; + if(!mzip.isOpen()){ + qWarning()<<"Zip file is not open while searching meta data."; + return; + } //find meta data if(!mzip.locateFile(".aurorameta").isValid()){ return; diff --git a/aurora/instgen/zipgen.cpp b/aurora/instgen/zipgen.cpp index 44fd3dd..b510e19 100644 --- a/aurora/instgen/zipgen.cpp +++ b/aurora/instgen/zipgen.cpp @@ -76,7 +76,7 @@ void ZipGen::writeMetaFile() //only if we have a ZIP if(!mzip.isOpen())return; //only if we have to say something - if(msymlinks.size()==0 && mperms.size()==0)return; + //if(msymlinks.size()==0 && mperms.size()==0)return; //create XML form QDomDocument doc; QDomElement root=doc.createElement("AuroraFileMetaData"); -- 1.7.2.5