projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
_cmp use name if order is the same.
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index c2de0045ba4aab2a31b41390bd04affebd698432..e361b3c446ec5ebc212c1d7dee71a68b822ed912 100644
(file)
--- a/
wizard/bertos_utils.py
+++ b/
wizard/bertos_utils.py
@@
-51,6
+51,15
@@
from _wizard_version import WIZARD_VERSION
from LoadException import VersionException, ToolchainException
from LoadException import VersionException, ToolchainException
+def _cmp(x, y):
+ result = cmp(x["info"].get('ord', 0), y["info"].get('ord', 0))
+ if result == 0:
+ result = cmp(
+ x["info"].get("name", x["info"]["filename"]).lower(),
+ y["info"].get("name", y["info"]["filename"]).lower()
+ )
+ return result
+
def isBertosDir(directory):
return os.path.exists(directory + "/VERSION")
def isBertosDir(directory):
return os.path.exists(directory + "/VERSION")
@@
-297,7
+306,7
@@
def findModuleFiles(module, project_info):
# TODO: split me in a method/function
try:
version_string = bertosVersion(project_info.info("BERTOS_PATH"))
# TODO: split me in a method/function
try:
version_string = bertosVersion(project_info.info("BERTOS_PATH"))
- version_list = [int(i) for i in version_string.split()[
-
1].split('.')]
+ version_list = [int(i) for i in version_string.split()[1].split('.')]
except ValueError:
# If the version file hasn't a valid version number assume it's an older
# project.
except ValueError:
# If the version file hasn't a valid version number assume it's an older
# project.