diff options
author | Nicolas Vigier <boklm@mageia.org> | 2011-01-28 18:27:48 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2011-01-28 18:27:48 +0000 |
commit | 59341cd17766e9aae61256160009184dc469eec3 (patch) | |
tree | e996eee5ee1e8cc7805299cb1bb82bc8d3a3befa /MgaRepo/binrepo.py | |
parent | 98ac9bd43092fbffdbf6e031c18d7a87e0f6131e (diff) | |
download | mgarepo-59341cd17766e9aae61256160009184dc469eec3.tar mgarepo-59341cd17766e9aae61256160009184dc469eec3.tar.gz mgarepo-59341cd17766e9aae61256160009184dc469eec3.tar.bz2 mgarepo-59341cd17766e9aae61256160009184dc469eec3.tar.xz mgarepo-59341cd17766e9aae61256160009184dc469eec3.zip |
add binrepo revision options
Diffstat (limited to 'MgaRepo/binrepo.py')
-rw-r--r-- | MgaRepo/binrepo.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MgaRepo/binrepo.py b/MgaRepo/binrepo.py index 9eb5c03..2a6f437 100644 --- a/MgaRepo/binrepo.py +++ b/MgaRepo/binrepo.py @@ -151,7 +151,7 @@ def make_symlinks(source, dest): os.symlink(linkpath, destpath) def download(targetdir, pkgdirurl=None, export=False, show=True, - revision=None, symlinks=True, check=False): + revision=None, binrev=None, symlinks=True, check=False): assert not export or (export and pkgdirurl) svn = SVN() sourcespath = os.path.join(targetdir, "SOURCES") @@ -160,8 +160,7 @@ def download(targetdir, pkgdirurl=None, export=False, show=True, topurl = translate_url(pkgdirurl) else: topurl = translate_topdir(targetdir) - binrev = None - if revision: + if revision and not binrev: if pkgdirurl: binrev = mapped_revision(pkgdirurl, revision) else: @@ -409,9 +408,10 @@ def mapped_revision(target, revision, wc=False): binrev = "{%s}" % date return binrev -def markrelease(sourceurl, releasesurl, version, release, revision): +def markrelease(sourceurl, releasesurl, version, release, revision, binrev): svn = SVN() - binrev = mapped_revision(sourceurl, revision) + if not binrev: + binrev = mapped_revision(sourceurl, revision) binsource = translate_url(sourceurl) binreleases = translate_url(releasesurl) versiondir = mirror._joinurl(binreleases, version) |