Modified: build_system/mgarepo/trunk/MgaRepo/binrepo.py
===================================================================
--- build_system/mgarepo/trunk/MgaRepo/binrepo.py 2011-01-25 18:33:00 UTC (rev 345)
+++ build_system/mgarepo/trunk/MgaRepo/binrepo.py 2011-01-25 19:00:38 UTC (rev 346)
@@ -306,8 +306,9 @@
bpath = os.path.basename(path)
topdir = getpkgtopdir()
bintopdir = translate_topdir(topdir)
+ sources = sources_path(topdir)
+ svn.update(sources)
update = update_sources_threaded(topdir, removed=[bpath])
- sources = sources_path(topdir)
silent = config.get("log", "ignore-string", "SILENT")
if not message:
message = "%s: delete binary file %s" % (silent, bpath)
@@ -363,11 +364,16 @@
if not message:
message = "%s: new binary files %s" % (silent, " ".join(paths))
make_symlinks(bindir, sourcesdir)
+ sources = sources_path(topdir)
+ if svn.info2(sources):
+ svn.update(sources)
update = update_sources_threaded(topdir, added=paths)
rev = svn.commit(binpath, log=message)
svn.propset(PROP_BINREPO_REV, str(rev), topdir)
- sources = sources_path(topdir)
- svn.add(sources)
+ if svn.info2(sources):
+ svn.update(sources)
+ else:
+ svn.add(sources)
update.join()
svn.commit(topdir + " " + sources, log=message, nonrecursive=True)