commit 6: d29b81104a88
parent 5: 58527e5a9f85
branch: default
Handle function name change, fix handling of non-specified special troves (RBLD-152, RBL-4034)
Joseph Tate
15 months ago

Changed (Δ24 bytes):

raw changeset »

rbclient/facade/rbuilderfacade/__init__.py (3 lines added, 2 lines removed)

rbclient/internal/buildcmds.py (1 lines added, 1 lines removed)

Up to file-list rbclient/facade/rbuilderfacade/__init__.py:

@@ -28,6 +28,7 @@ from rbclient.facade.rbuilderfacade impo
28
28
import rbuild.errors
29
29
from rbclient import errors
30
30
from conary.conaryclient import cmdline as conarycmdline
31
from conary import versions as conaryvers
31
32
from conary.deps import deps as conarydeps
32
33
33
34
__all__ = ['RbuilderFacadeExt']
@@ -131,8 +132,8 @@ class RbuilderClientExt(rbuild.facade.rb
131
132
                else:
132
133
                    # not specified at all, resolve it ourselves from just the
133
134
                    # name, using the label and flavor form the group
134
                    error, val = self.server.resolveExtraTrove(productId, name, groupVersion,
135
                                    groupFlavor, groupVersion, groupFlavor)
135
                    error, val = self.server.resolveExtraTrove(productId, name, '',
136
                                    '', groupVersion, groupFlavor)
136
137
                if error:
137
138
                    raise rbuild.errors.RbuilderError(*val)
138
139
                if val:

Up to file-list rbclient/internal/buildcmds.py:

@@ -282,7 +282,7 @@ Note: all build types may not be support
282
282
                'be used together.')
283
283
284
284
        # resolve a trovespec
285
        res = handle.facade.conary.findTrove([troveSpec])
285
        res = handle.facade.conary.findTroves([troveSpec])
286
286
287
287
        n, v, f = res.values()[0][0]
288
288