diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-07-26 17:49:24 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-07-29 13:22:22 +0200 |
commit | ac16f9c34572eb46de8dc5f46778494378a4b992 (patch) | |
tree | dec249307b404699e20767269026dd6946fc8bc4 /tools | |
parent | 16eaa4a7cf0915dcd7994486e0216017891105da (diff) |
existing empty dir shouldn't be a reason to cancel repogen
Change-Id: I754063a810c8d30cd26dee55e36b675885e6a4b7
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/repogen/repogen.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp index 154a924ac..4113826b8 100644 --- a/tools/repogen/repogen.cpp +++ b/tools/repogen/repogen.cpp @@ -177,7 +177,9 @@ int main(int argc, char** argv) if (remove) QInstaller::removeDirectory(repositoryDir); - if (!updateExistingRepository && QFile::exists(repositoryDir)) { + if (!updateExistingRepository && QFile::exists(repositoryDir) && !QDir(repositoryDir).entryList( + QDir::AllEntries | QDir::NoDotAndDotDot).isEmpty()) { + throw QInstaller::Error(QObject::tr("Repository target folder %1 already exists!") .arg(repositoryDir)); } |