summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-04 13:46:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-07 09:06:37 +0000
commitee6f34483a9bfeca5b5c3656fd62bb4849d5fbb8 (patch)
treee3ac06e1524495d0b5d97562fdd42801c672dab1 /bitbake/lib/bb/fetch2
parent984e90f4d71d866580131c4927b0a77baf1bb9bd (diff)
downloadpoky-ee6f34483a9bfeca5b5c3656fd62bb4849d5fbb8.tar.gz
bitbake/fetch2/svn: The concept of using dates with svn is totally insane, drop support
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/svn.py22
1 files changed, 1 insertions, 21 deletions
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index ce86288903..4ab643bcf7 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -57,26 +57,9 @@ class Svn(FetchMethod):
57 ud.moddir = os.path.join(ud.pkgdir, ud.module) 57 ud.moddir = os.path.join(ud.pkgdir, ud.module)
58 58
59 if 'rev' in ud.parm: 59 if 'rev' in ud.parm:
60 ud.date = ""
61 ud.revision = ud.parm['rev'] 60 ud.revision = ud.parm['rev']
62 elif 'date' in ud.date:
63 ud.date = ud.parm['date']
64 ud.revision = ""
65 else:
66 #
67 # ***Nasty hack***
68 # If DATE in unexpanded PV, use ud.date (which is set from SRCDATE)
69 # Should warn people to switch to SRCREV here
70 #
71 pv = data.getVar("PV", d, 0)
72 if "DATE" in pv:
73 ud.revision = ""
74 else:
75 # use the initizlied revision
76 if ud.revision:
77 ud.date = ""
78 61
79 ud.localfile = data.expand('%s_%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision, ud.date), d) 62 ud.localfile = data.expand('%s_%s_%s_%s_.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision), d)
80 63
81 def _buildsvncommand(self, ud, d, command): 64 def _buildsvncommand(self, ud, d, command):
82 """ 65 """
@@ -94,7 +77,6 @@ class Svn(FetchMethod):
94 77
95 svnroot = ud.host + ud.path 78 svnroot = ud.host + ud.path
96 79
97 # either use the revision, or SRCDATE in braces,
98 options = [] 80 options = []
99 81
100 if ud.user: 82 if ud.user:
@@ -110,8 +92,6 @@ class Svn(FetchMethod):
110 if ud.revision: 92 if ud.revision:
111 options.append("-r %s" % ud.revision) 93 options.append("-r %s" % ud.revision)
112 suffix = "@%s" % (ud.revision) 94 suffix = "@%s" % (ud.revision)
113 elif ud.date:
114 options.append("-r {%s}" % ud.date)
115 95
116 if command is "fetch": 96 if command is "fetch":
117 svncmd = "%s co %s %s://%s/%s%s %s" % (basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module) 97 svncmd = "%s co %s %s://%s/%s%s %s" % (basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module)