X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBVersionPage.py;h=bd78fe01ebb02c139395ee40659943f98b9b41db;hb=f212c4cd54cf056d77ea869887341ca6bfaa4c3d;hp=ce72ff461607c633688a54b8189a1788dfcca17f;hpb=255e98716335ab8e40da330bad016a8983046dec;p=bertos.git diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py index ce72ff46..bd78fe01 100644 --- a/wizard/BVersionPage.py +++ b/wizard/BVersionPage.py @@ -9,6 +9,8 @@ # Author: Lorenzo Berni # +import os + from PyQt4.QtGui import * from BWizardPage import * import bertos_utils @@ -47,11 +49,11 @@ class BVersionPage(BWizardPage): def _insertListElement(self, directory): if bertos_utils.isBertosDir(directory): - item = QListWidgetItem(QIcon(":/images/ok.png"), bertos_utils.bertosVersion(directory) + " (\"" + directory + "\")") + item = QListWidgetItem(QIcon(":/images/ok.png"), bertos_utils.bertosVersion(directory) + " (\"" + os.path.normpath(directory) + "\")") item.setData(Qt.UserRole, qvariant_converter.convertString(directory)) self.pageContent.versionList.addItem(item) elif len(directory) > 0: - item = QListWidgetItem(QIcon(":/images/warning.png"), "UNKNOWN" + " (\"" + directory + "\")") + item = QListWidgetItem(QIcon(":/images/warning.png"), "UNKNOWN" + " (\"" + os.path.normpath(directory) + "\")") item.setData(Qt.UserRole, qvariant_converter.convertString(directory)) self.pageContent.versionList.addItem(item) @@ -62,8 +64,12 @@ class BVersionPage(BWizardPage): def isComplete(self): if self.pageContent.versionList.currentRow() != -1: - self._projectInfoStore("SOURCES_PATH", qvariant_converter.getString(self.pageContent.versionList.currentItem().data(Qt.UserRole))) - return True + # Remove trailing slash + sources_path = qvariant_converter.getString(self.pageContent.versionList.currentItem().data(Qt.UserRole)) + if sources_path.endswith(os.sep): + sources_path = sources_path[:-1] + self._projectInfoStore("SOURCES_PATH", sources_path) + return True else: return False @@ -85,4 +91,4 @@ class BVersionPage(BWizardPage): def rowChanged(self): self.emit(SIGNAL("completeChanged()")) - \ No newline at end of file +