diff options
author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2007-02-13 14:29:58 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2007-02-13 14:29:58 +0000 |
commit | 7b3a9840776b74928b356e01d9306e368f085387 (patch) | |
tree | 703b7cf9fa9367041abea9e497770ee8e8be449a | |
parent | a4bf425650dfc30641f5a7e6382fc1494cd183af (diff) | |
download | bitbake-7b3a9840776b74928b356e01d9306e368f085387.tar.gz |
svn fetcher: add two backport patches from OE #829
- allow to use 'srcdate' param in SRC_URI lines (from trunk)
- do not use SRCDATE in archive names when REV is provided (from trunk)
-rw-r--r-- | lib/bb/fetch/svn.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/bb/fetch/svn.py b/lib/bb/fetch/svn.py index 610b0b46b..868e3bcf2 100644 --- a/lib/bb/fetch/svn.py +++ b/lib/bb/fetch/svn.py @@ -63,6 +63,12 @@ class Svn(Fetch): date = Fetch.getSRCDate(d) + if 'srcdate' in parm: + date = parm['srcdate'] + + if revision: + date = "" + return os.path.join(data.getVar("DL_DIR", d, 1),data.expand('%s_%s_%s_%s_%s.tar.gz' % ( module.replace('/', '.'), host, path.replace('/', '.'), revision, date), d)) localpath = staticmethod(localpath) @@ -98,6 +104,9 @@ class Svn(Fetch): date = Fetch.getSRCDate(d) + if 'srcdate' in parm: + date = parm['srcdate'] + revision = "" if 'rev' in parm: revision = parm['rev'] @@ -107,6 +116,10 @@ class Svn(Fetch): elif date != "now": options.append("-r {%s}" % date) + if revision: + date = "" + + if user: options.append("--username %s" % user) |