| 1 |
Author: grobian |
| 2 |
Date: 2009-10-02 20:58:01 +0000 (Fri, 02 Oct 2009) |
| 3 |
New Revision: 14475 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/portage/versions.py |
| 7 |
Log: |
| 8 |
Resolve conflict, bah |
| 9 |
|
| 10 |
Modified: main/branches/prefix/pym/portage/versions.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/pym/portage/versions.py 2009-10-02 20:41:13 UTC (rev 14474) |
| 13 |
+++ main/branches/prefix/pym/portage/versions.py 2009-10-02 20:58:01 UTC (rev 14475) |
| 14 |
@@ -257,38 +257,8 @@ |
| 15 |
if m is None: |
| 16 |
return None |
| 17 |
|
| 18 |
-<<<<<<< .working |
| 19 |
- #verify rev |
| 20 |
- revok=0 |
| 21 |
- myrev=myparts[-1] |
| 22 |
- if len(myrev) and myrev[0]=="r": |
| 23 |
- try: |
| 24 |
- # PREFIX hack: allow floats in revisions |
| 25 |
- float(myrev[1:]) |
| 26 |
- revok=1 |
| 27 |
- except ValueError: # from int() |
| 28 |
- pass |
| 29 |
- if revok: |
| 30 |
- verPos = -2 |
| 31 |
- revision = myparts[-1] |
| 32 |
- else: |
| 33 |
- verPos = -1 |
| 34 |
- revision = "r0" |
| 35 |
- |
| 36 |
- if ververify(myparts[verPos]): |
| 37 |
- if len(myparts)== (-1*verPos): |
| 38 |
- pkgcache[mypkg]=None |
| 39 |
- return None |
| 40 |
- else: |
| 41 |
- myval=("-".join(myparts[:verPos]),myparts[verPos],revision) |
| 42 |
- pkgcache[mypkg]=myval |
| 43 |
- return myval |
| 44 |
- else: |
| 45 |
- pkgcache[mypkg]=None |
| 46 |
-======= |
| 47 |
if m.group('pn_inval') is not None: |
| 48 |
# package name appears to have a version-like suffix |
| 49 |
->>>>>>> .merge-right.r14472 |
| 50 |
return None |
| 51 |
|
| 52 |
rev = m.group('rev') |
Archives