[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kapptemplate/Applications/16.04] src/application: Avoid duplicated path seperators in project desti
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2016-03-31 21:59:01
Message-ID: E1alkcH-000759-WC () scm ! kde ! org
[Download RAW message or body]
Git commit 463ae0ab1f6e04b6af4202e1b840d70b533fc4bd by Friedrich W. H. Kossebau.
Committed on 31/03/2016 at 21:58.
Pushed by kossebau into branch 'Applications/16.04'.
Avoid duplicated path seperators in project destination url
M +5 -2 src/application/generatepage.cpp
http://commits.kde.org/kapptemplate/463ae0ab1f6e04b6af4202e1b840d70b533fc4bd
diff --git a/src/application/generatepage.cpp b/src/application/generatepage.cpp
index 5755eaf..a0cc9ae 100644
--- a/src/application/generatepage.cpp
+++ b/src/application/generatepage.cpp
@@ -177,7 +177,11 @@ void GeneratePage::initializePage()
arch = new KTar(archName, "application/x-bzip");
}
- QString dest(field("url").toString() + '/' + appName.toLower());
+ QString url = field("url").toString();
+ if (url.endsWith(QLatin1Char('/'))) {
+ url.chop(1);
+ }
+ QString dest(url + '/' + appName.toLower());
if (arch->open(QIODevice::ReadOnly)) {
if (!QFileInfo(dest).exists()) {
QDir::root().mkdir(dest);
@@ -191,7 +195,6 @@ void GeneratePage::initializePage()
ui_generate.label->setText(feedback);
QString resume;
- QString url = field("url").toString();
resume = i18n("Your project name is: <b>%1</b>, based on the %2 template.<br \
/>", appName, templateName); resume.append(i18n("Version: %1 <br /><br />", \
version)); resume.append(i18n("Installed in: %1 <br /><br />", url));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic