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
update for new sqlalchemy api
[invirt/packages/invirt-dev.git]
/
invirtibuilder
diff --git
a/invirtibuilder
b/invirtibuilder
index
8a6b077
..
0e5ef50
100755
(executable)
--- a/
invirtibuilder
+++ b/
invirtibuilder
@@
-202,8
+202,10
@@
def uploadBuild(pocket, workdir):
except subprocess.CalledProcessError, e:
if not force:
raise
except subprocess.CalledProcessError, e:
if not force:
raise
- packages = deb822.Changes(open(changes).read())['Binary']
- for package in packages.split():
+ changelog = deb822.Changes(open(changes).read())
+ packages = set(changelog['Binary'].split())
+ packages.add(changelog['Source'])
+ for package in packages:
logAndRun(['reprepro-env', 'remove', apt, package])
logAndRun(upload)
logAndRun(['reprepro-env', 'remove', apt, package])
logAndRun(upload)
@@
-285,8
+287,8
@@
def packageWorkdir(package, commit, build_id):
workdir = tempfile.mkdtemp(prefix=("b%d-" % build_id))
try:
p_archive = subprocess.Popen(
workdir = tempfile.mkdtemp(prefix=("b%d-" % build_id))
try:
p_archive = subprocess.Popen(
- ['git', 'archive',
- '--remote=file://%s' % b.getRepo(package),
+ ['git', '--git-dir=%s' % (b.getRepo(package),),
+ 'archive',
'--prefix=%s/' % package,
commit,
],
'--prefix=%s/' % package,
commit,
],
@@
-328,7
+330,7
@@
def build():
db.pocket = pocket
db.commit = commit
db.principal = principal
db.pocket = pocket
db.commit = commit
db.principal = principal
- database.session.save_or_update(db)
+ database.session.add(db)
database.session.commit()
database.session.begin()
database.session.commit()
database.session.begin()
@@
-413,7
+415,7
@@
def build():
if logfile is not None:
logfile.close()
if logfile is not None:
logfile.close()
- database.session.save_or_update(db)
+ database.session.add(db)
database.session.commit()
# Finally, now that everything is done, remove the
database.session.commit()
# Finally, now that everything is done, remove the