projects
/
invirt/packages/invirt-dev.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename the "git" tree in the configuration to "build" to be more accurate.
[invirt/packages/invirt-dev.git]
/
python
/
invirt
/
builder.py
diff --git
a/python/invirt/builder.py
b/python/invirt/builder.py
index
e3280aa
..
a89acf2
100644
(file)
--- a/
python/invirt/builder.py
+++ b/
python/invirt/builder.py
@@
-31,12
+31,12
@@
def getRepo(package):
def pocketToGit(pocket):
"""Map a pocket in the configuration to a git branch."""
def pocketToGit(pocket):
"""Map a pocket in the configuration to a git branch."""
- return getattr(getattr(config.git.pockets, pocket), 'git', pocket)
+ return getattr(getattr(config.build.pockets, pocket), 'git', pocket)
def pocketToApt(pocket):
"""Map a pocket in the configuration to an apt repo pocket."""
def pocketToApt(pocket):
"""Map a pocket in the configuration to an apt repo pocket."""
- return getattr(getattr(config.git.pockets, pocket), 'apt', pocket)
+ return getattr(getattr(config.build.pockets, pocket), 'apt', pocket)
def getGitFile(package, ref, path):
def getGitFile(package, ref, path):
@@
-88,7
+88,7
@@
def validateBuild(pocket, package, commit):
package_repo = getRepo(package)
new_version = getVersion(package, commit)
package_repo = getRepo(package)
new_version = getVersion(package, commit)
- for p in config.git.pockets:
+ for p in config.build.pockets:
if p == pocket:
continue
if p == pocket:
continue
@@
-105,7
+105,7
@@
def validateBuild(pocket, package, commit):
'pocket %s from commit %s' %
(new_version, package, p, current_commit))
'pocket %s from commit %s' %
(new_version, package, p, current_commit))
- if config.git.pockets[pocket].get('allow_backtracking', False):
+ if config.build.pockets[pocket].get('allow_backtracking', False):
branch = pocketToGit(pocket)
current_version = getVersion(package, branch)
if new_version <= current_version:
branch = pocketToGit(pocket)
current_version = getVersion(package, branch)
if new_version <= current_version: