diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2006-02-21 00:16:11 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2006-02-21 00:16:11 +0000 |
commit | dd4344ef656025fcc5d0ab88934940ac6105da99 (patch) | |
tree | fce6f168957ac02cb4cf3272820147201dffa894 | |
parent | 5fd71d34683315a35b5265242e1aea3c94de33fe (diff) | |
download | bitbake-dd4344ef656025fcc5d0ab88934940ac6105da99.tar.gz |
bitbake/lib/bb/utils.py:
- Fix a RDEPENDS parsing bug in utils:explode_deps()
(versions containing spaces didn't parse correctly)
bitbake/lib/bb/fetch/git.py:
- Update git fetcher behaviour to match git changes
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/bb/__init__.py | 2 | ||||
-rw-r--r-- | lib/bb/fetch/git.py | 5 | ||||
-rw-r--r-- | lib/bb/utils.py | 6 |
4 files changed, 11 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Changes in BitBake 1.3.x: + - Fix to check both RDEPENDS and RDEPENDS_${PN} + - Fix a RDEPENDS parsing bug in utils:explode_deps() + - Update git fetcher behaviour to match git changes + Changes in BitBake 1.3.3: - Create a new Fetcher module to ease the development of new Fetchers. diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index 5191fd592..76ae97bef 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -23,7 +23,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. """ -__version__ = "1.3.3.1" +__version__ = "1.3.3.2" __all__ = [ diff --git a/lib/bb/fetch/git.py b/lib/bb/fetch/git.py index 11ca6821a..f38709d2b 100644 --- a/lib/bb/fetch/git.py +++ b/lib/bb/fetch/git.py @@ -116,12 +116,11 @@ class Git(Fetch): #if os.path.exists(repodir): #prunedir(repodir) - bb.mkdirhier(repodir) - os.chdir(repodir) - #print("Changing to %s" % repodir) if os.access(repofile, os.R_OK): + bb.mkdirhier(repodir) + os.chdir(repodir) rungitcmd("tar -xzf %s" % (repofile),d) else: rungitcmd("git clone rsync://%s%s %s" % (host, path, repodir),d) diff --git a/lib/bb/utils.py b/lib/bb/utils.py index e2319aa12..2f53c65ec 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -86,10 +86,10 @@ def explode_deps(s): j = [] if flag: j.append(i) - if i.endswith(')'): + else: + r.append(i) + if flag and i.endswith(')'): flag = False # Ignore version #r[-1] += ' ' + ' '.join(j) - else: - r.append(i) return r |