mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
bitbake: fetch2/svn: Allow peg-revision functionality to be disabled
Sometimes the peg revision functionality we use in the svn fetcher is not the correct option. Add a parameter nopegrevision which can be added to disable this behaviour. [YOCTO #6258] (Bitbake rev: ea26682b706f655a8e418f56bebe742e2d130a1d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -57,7 +57,12 @@ class Svn(FetchMethod):
|
|||||||
if 'rev' in ud.parm:
|
if 'rev' in ud.parm:
|
||||||
ud.revision = ud.parm['rev']
|
ud.revision = ud.parm['rev']
|
||||||
|
|
||||||
ud.localfile = d.expand('%s_%s_%s_%s_.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision))
|
# Whether to use the @REV peg-revision syntax in the svn command or not
|
||||||
|
ud.pegrevision = True
|
||||||
|
if 'nopegrevision' in ud.parm:
|
||||||
|
ud.pegrevision = False
|
||||||
|
|
||||||
|
ud.localfile = d.expand('%s_%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision, ["0", "1"][ud.pegrevision]))
|
||||||
|
|
||||||
def _buildsvncommand(self, ud, d, command):
|
def _buildsvncommand(self, ud, d, command):
|
||||||
"""
|
"""
|
||||||
@@ -98,7 +103,8 @@ class Svn(FetchMethod):
|
|||||||
|
|
||||||
if ud.revision:
|
if ud.revision:
|
||||||
options.append("-r %s" % ud.revision)
|
options.append("-r %s" % ud.revision)
|
||||||
suffix = "@%s" % (ud.revision)
|
if ud.pegrevision:
|
||||||
|
suffix = "@%s" % (ud.revision)
|
||||||
|
|
||||||
if command == "fetch":
|
if command == "fetch":
|
||||||
transportuser = ud.parm.get("transportuser", "")
|
transportuser = ud.parm.get("transportuser", "")
|
||||||
|
|||||||
Reference in New Issue
Block a user