RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 07-Jun-2011 15:09:45
Branch: HEAD Handle: 2011060713094400
Modified files:
rpm CHANGES
rpm/scripts pythoneggs.py
Log:
don't pick up python version from python egg, rely on path only in stead to
avoid incorrect version dependencies if any other egg metadata for other
versions is found.
Summary:
Revision Changes Path
1.3653 +4 -0 rpm/CHANGES
1.3 +7 -6 rpm/scripts/pythoneggs.py
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3652 -r1.3653 CHANGES
--- rpm/CHANGES 7 Jun 2011 12:35:29 -0000 1.3652
+++ rpm/CHANGES 7 Jun 2011 13:09:44 -0000 1.3653
@@ -1,4 +1,8 @@
HEAD:
+ - proyvind: don't pick up python version from python egg, rely on path
+ only in stead to avoid incorrect version dependencies if any other
+ egg metadata for other versions is found.
+ - proyvind: rpmjs: port to SpiderMonkey 1.8.5 API for real.
- afb: mongo: rename --json to --mongo
- afb: yaml: make the mapping unordered
- afb: sqlite: fix database schema used
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/pythoneggs.py
============================================================================
$ cvs diff -u -r1.2 -r1.3 pythoneggs.py
--- rpm/scripts/pythoneggs.py 25 Jan 2011 21:47:42 -0000 1.2
+++ rpm/scripts/pythoneggs.py 7 Jun 2011 13:09:44 -0000 1.3
@@ -106,12 +106,13 @@
py_abi = False
if name in py_deps:
py_deps.pop(name)
- elif py_abi and dist.py_version:
- if not name in py_deps:
- py_deps[name] = []
- spec = ('==', dist.py_version)
- if not spec in py_deps[name]:
- py_deps[name].append(spec)
+ # disabled: pick up python version from directory path only
+ #elif py_abi and dist.py_version:
+ # if not name in py_deps:
+ # py_deps[name] = []
+ # spec = ('==', dist.py_version)
+ # if not spec in py_deps[name]:
+ # py_deps[name].append(spec)
deps = dist.requires()
if Suggests:
depsextras = dist.requires(extras=dist.extras)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
