rpathsync / rbuild (http://wiki.rpath.com/wiki/rBuild)
rBuild is a developer tool for building products using rPath's other technologies: Conary, rMake, and rBuilder.
Clone this repository (size: 506.5 KB): HTTPS / SSH
$ hg clone http://bitbucket.org/rpathsync/rbuild/
| commit 381: | b51a625d5a0f |
| parent 380: | 259b2d80bd64 |
| branch: | default |
back out prematurely-applied 259b2d80bd64
Michael K. Johnson
5 months ago
Changed (Δ516 bytes):
raw changeset »
plugins/checkout/__init__.py (6 lines added, 14 lines removed)
rbuild/facade/conaryfacade.py (2 lines added, 2 lines removed)
Up to file-list plugins/checkout/__init__.py:
| … | … | @@ -52,35 +52,28 @@ class CheckoutCommand(command.BaseComman |
52 |
52 |
docs = {'derive' : "Create derived package (based on upstream binary)", |
53 |
53 |
'shadow' : "Create shadowed package (based on upstream source)", |
54 |
54 |
'new' : ("Create a new version of the package even if" |
55 |
" an upstream version exists"), |
|
56 |
'template' : ("If creating a new package, specify a template." |
|
57 |
|
|
55 |
" an upstream version exists") } |
|
58 |
56 |
|
59 |
57 |
def addLocalParameters(self, argDef): |
60 |
58 |
argDef['derive'] = command.NO_PARAM |
61 |
59 |
argDef['shadow'] = command.NO_PARAM |
62 |
60 |
argDef['new'] = command.NO_PARAM |
63 |
argDef['template'] = command.ONE_PARAM |
|
64 |
61 |
|
65 |
62 |
def runCommand(self, handle, argSet, args): |
66 |
63 |
packageName, = self.requireParameters(args, ['packageName'])[1:] |
67 |
64 |
derive = argSet.pop('derive', False) |
68 |
65 |
new = argSet.pop('new', False) |
69 |
66 |
shadow = argSet.pop('shadow', False) |
70 |
template = argSet.pop('template', False) |
|
71 |
67 |
self.runCheckoutCommand(handle, packageName, new=new, shadow=shadow, |
72 |
derive=derive |
|
68 |
derive=derive) |
|
73 |
69 |
|
74 |
70 |
def runCheckoutCommand(self, handle, packageName, new=False, shadow=False, |
75 |
derive=False |
|
71 |
derive=False): |
|
76 |
72 |
if [new, shadow, derive].count(True) > 1: |
77 |
73 |
raise errors.ParseError( |
78 |
74 |
'Only one of --new, --derive, or --shadow may be specified') |
79 |
75 |
if new: |
80 |
if template: |
|
81 |
return handle.Checkout.newPackage(packageName,template=template) |
|
82 |
else: |
|
83 |
return handle.Checkout.newPackage(packageName) |
|
76 |
return handle.Checkout.newPackage(packageName) |
|
84 |
77 |
elif shadow: |
85 |
78 |
return handle.Checkout.shadowPackage(packageName) |
86 |
79 |
elif derive: |
| … | … | @@ -160,7 +153,7 @@ class Checkout(pluginapi.Plugin): |
160 |
153 |
self.handle.ui.info('Shadowed package %r in %r', packageName, |
161 |
154 |
self._relPath(os.getcwd(), targetDir)) |
162 |
155 |
|
163 |
def newPackage(self, packageName, message=None |
|
156 |
def newPackage(self, packageName, message=None): |
|
164 |
157 |
ui = self.handle.ui |
165 |
158 |
conaryFacade = self.handle.facade.conary |
166 |
159 |
productStore = self.handle.productStore |
| … | … | @@ -196,8 +189,7 @@ class Checkout(pluginapi.Plugin): |
196 |
189 |
return |
197 |
190 |
|
198 |
191 |
conaryFacade.createNewPackage(packageName, currentLabel, |
199 |
targetDir=targetDir, |
|
200 |
template=template) |
|
192 |
targetDir=targetDir) |
|
201 |
193 |
ui.info('Created new package %r in %r', packageName, |
202 |
194 |
self._relPath(os.getcwd(), targetDir)) |
203 |
195 |
return |
Up to file-list rbuild/facade/conaryfacade.py:
| … | … | @@ -529,7 +529,7 @@ class ConaryFacade(object): |
529 |
529 |
|
530 |
530 |
|
531 |
531 |
|
532 |
def createNewPackage(self, package, label, targetDir=None |
|
532 |
def createNewPackage(self, package, label, targetDir=None): |
|
533 |
533 |
""" |
534 |
534 |
Create a subdirectory containing files to initialize a new |
535 |
535 |
conary source package. Similar to the C{cvc newpkg} command. |
| … | … | @@ -542,7 +542,7 @@ class ConaryFacade(object): |
542 |
542 |
@type targetDir: string |
543 |
543 |
""" |
544 |
544 |
checkin.newTrove(self._getRepositoryClient(), self.getConaryConfig(), |
545 |
'%s=%s' % (package, label), dir=targetDir |
|
545 |
'%s=%s' % (package, label), dir=targetDir) |
|
546 |
546 |
|
547 |
547 |
def shadowSource(self, name, version, targetLabel): |
548 |
548 |
""" |