rpathsync / rmake (http://wiki.rpath.com/wiki/rMake)
rMake facilitates building packages consistently across computers with dissimilar environments.
| commit 1285: | f45aa09ab797 |
| parent 1284: | af21492480c3 |
| branch: | default |
Further Conary 2.1.x compatibility
Michael K. Johnson
3 months ago
Changed (Δ231 bytes):
raw changeset »
rmake/compat.py (10 lines added, 5 lines removed)
Up to file-list rmake/compat.py:
1 |
1 |
# |
2 |
# Copyright (c) 2006-200 |
|
2 |
# Copyright (c) 2006-2009 rPath, Inc. All Rights Reserved. |
|
3 |
3 |
# |
4 |
4 |
""" |
5 |
5 |
Tracks compatibility with versions of integrated software for backwards |
| … | … | @@ -49,8 +49,10 @@ class ConaryVersion(object): |
49 |
49 |
oneOneVersion = 19 |
50 |
50 |
oneTwoVersion = 0 |
51 |
51 |
twoZeroVersion = 0 |
52 |
twoOneVersion = 0 |
|
52 |
53 |
if not self.checkVersion(oneZeroVersion, oneOneVersion, |
53 |
oneTwoVersion, twoZeroVersion |
|
54 |
oneTwoVersion, twoZeroVersion |
|
55 |
twoOneVersion): |
|
54 |
56 |
versions = [] |
55 |
57 |
if oneOneVersion: |
56 |
58 |
versions.append('1.1.%s' % oneOneVersion) |
| … | … | @@ -58,13 +60,16 @@ class ConaryVersion(object): |
58 |
60 |
versions.append('1.2.%s' % oneTwoVersion) |
59 |
61 |
if twoZeroVersion: |
60 |
62 |
versions.append('2.0.%s' % twoZeroVersion) |
63 |
if twoOneVersion: |
|
64 |
versions.append('2.1.%s' % twoZeroVersion) |
|
61 |
65 |
versions = ' or '.join(versions) |
62 |
66 |
raise errors.RmakeError('rMake requires conary' |
63 |
67 |
' version %s or greater' % versions) |
64 |
68 |
|
65 |
69 |
def requireVersion(self, oneZeroVersion, oneOneVersion, twoZeroVersion, |
66 |
msg): |
|
67 |
if not self.checkVersion(oneZeroVersion, oneOneVersion, twoZeroVersion): |
|
70 |
twoOneVersion, msg): |
|
71 |
if not self.checkVersion(oneZeroVersion, oneOneVersion, twoZeroVersion, |
|
72 |
twoOneVersion): |
|
68 |
73 |
version = '' |
69 |
74 |
if oneZeroVersion: |
70 |
75 |
version = '1.0.%s or ' % oneZeroVersion |
| … | … | @@ -96,7 +101,7 @@ class ConaryVersion(object): |
96 |
101 |
return self.checkVersion(False, 90) |
97 |
102 |
|
98 |
103 |
def requireFindGroupSources(self): |
99 |
return self.requireVersion(False, 21, None, |
|
104 |
return self.requireVersion(False, 21, None, None, 'building group sources') |
|
100 |
105 |
|
101 |
106 |
def requireFactoryRecipeGeneration(self): |
102 |
107 |
''' |