aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-08-17 13:13:37 +0000
committerNicolas Vigier <boklm@mageia.org>2011-08-17 13:13:37 +0000
commiteb4f06d051ffc87bf004fb4f6589b3937525bf0d (patch)
tree5e6a1ddc2ce2dd408ff79d1b7cbf365d22abf484
parentd8a6cc7ef7ec79d9eaa26e18dcc7dea74ad7b985 (diff)
downloadmgarepo-eb4f06d051ffc87bf004fb4f6589b3937525bf0d.tar
mgarepo-eb4f06d051ffc87bf004fb4f6589b3937525bf0d.tar.gz
mgarepo-eb4f06d051ffc87bf004fb4f6589b3937525bf0d.tar.bz2
mgarepo-eb4f06d051ffc87bf004fb4f6589b3937525bf0d.tar.xz
mgarepo-eb4f06d051ffc87bf004fb4f6589b3937525bf0d.zip
download binaries from new binrepo
-rw-r--r--MgaRepo/rpmutil.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/MgaRepo/rpmutil.py b/MgaRepo/rpmutil.py
index 8e4efc5..41c6f7a 100644
--- a/MgaRepo/rpmutil.py
+++ b/MgaRepo/rpmutil.py
@@ -102,11 +102,7 @@ def get_srpm(pkgdirurl,
"inside %s" % (revision or "HEAD", geturl)
mirror.info(geturl)
svn.export(geturl, tmpdir, rev=revision)
- if use_binrepo:
- binrepo_check = (binrepo_check or
- config.getbool("binrepo", "getsrpm-check", False))
- download_binaries(tmpdir, geturl, revision=revision,
- binrev=binrev, export=True, check=binrepo_check)
+ binrepo.download_binaries(tmpdir)
srpmsdir = os.path.join(tmpdir, "SRPMS")
os.mkdir(srpmsdir)
specsdir = os.path.join(tmpdir, "SPECS")
@@ -477,9 +473,7 @@ def checkout(pkgdirurl, path=None, revision=None, binrev=None, branch=None, dist
mirror.info(current, write=True)
svn = SVN()
svn.checkout(current, path, rev=revision, show=1)
- if use_binrepo:
- download_binaries(path, revision=revision, binrev=binrev, symlinks=binrepo_link,
- check=binrepo_check)
+ binrepo.download_binaries(path)
def getpkgtopdir(basedir=None):
#FIXME this implementation doesn't work well with relative path names,
@@ -644,7 +638,7 @@ def update(target=None):
raise Error, "target not in SVN nor in binaries "\
"repository: %s" % target
url = info["URL"]
- download_binaries(br_target, url)
+ binrepo.download_binaries(br_target)
def upload(paths, commit=True):
for path in paths: