Merge lp:~romaia/stoq/stoq-dev into lp:~stoq-dev/stoq/master-old

Proposed by Ronaldo Maia
Status: Merged
Approved by: Ronaldo Maia
Approved revision: 1578
Merged at revision: not available
Proposed branch: lp:~romaia/stoq/stoq-dev
Merge into: lp:~stoq-dev/stoq/master-old
Diff against target: None lines
To merge this branch: bzr merge lp:~romaia/stoq/stoq-dev
Reviewer Review Type Date Requested Status
George Kussumoto (community) Approve
Review via email: mp+9600@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ronaldo Maia (romaia) wrote :

Atualizando o script stoq-dev para usar o bzr do launchpad.

Revision history for this message
George Kussumoto (georgeyk) wrote :

Ficou faltando o common/, mas se vamos usar o ppa ele é desnecessário.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/stoq-dev'
2--- tools/stoq-dev 2008-04-14 15:47:36 +0000
3+++ tools/stoq-dev 2009-08-03 20:43:09 +0000
4@@ -24,58 +24,42 @@
5 import subprocess
6 import sys
7
8-# SVN_USER or None for anonymous
9-SVN_USER = None
10-
11-def geturl(project):
12- if SVN_USER:
13- return 'svn+ssh://svn.async.com.br/pub/%s' % (project,)
14- else:
15- return 'svn://svn.async.com.br/%s' % (project,)
16-
17 class Project(object):
18 name = None
19 env = {}
20 repo = ''
21
22-class SVNProject(Project):
23+class BzrProject(Project):
24 def checkout(self):
25- cmd = 'svn co -q %s/trunk %s' % (self.repo, self.name)
26- os.system(cmd)
27-
28- if SVN_USER is None:
29- return
30- cmd = ('cd %s/common && '
31- 'svn switch --relocate svn://svn.async.com.br/common '
32- 'svn+ssh://svn.async.com.br/common') % (self.name)
33+ cmd = 'bzr branch %s %s' % (self.repo, self.name)
34 os.system(cmd)
35
36 def update(self):
37- cmd = 'svn update'
38+ cmd = 'bzr pull'
39 os.system(cmd)
40
41-class Stoq(SVNProject):
42+class Stoq(BzrProject):
43 name = 'stoq'
44 env = {'PYTHONPATH': '$tree',
45 'PATH': '$tree/bin'}
46- repo = geturl('stoq')
47+ repo = 'lp:stoq'
48
49-class Stoqlib(SVNProject):
50+class Stoqlib(BzrProject):
51 name = 'stoqlib'
52 env = {'PYTHONPATH': '$tree'}
53- repo = geturl('stoqlib')
54+ repo = 'lp:stoqlib'
55
56-class Stoqdrivers(SVNProject):
57+class Stoqdrivers(BzrProject):
58 name = 'stoqdrivers'
59 env = {'PYTHONPATH': '$tree'}
60- repo = geturl('stoqdrivers')
61+ repo = 'lp:stoqdrivers'
62
63-class Kiwi(SVNProject):
64+class Kiwi(BzrProject):
65 name = 'kiwi'
66 env = {'PYTHONPATH': '$tree',
67 'GAZPACHO_PATH': '$tree/gazpacho-plugin',
68 'PATH': '$tree/bin'}
69- repo = geturl('kiwi')
70+ repo = 'lp:kiwi'
71
72 PROJECTS = {
73 'stoqlib': Stoqlib(),

Subscribers

People subscribed via source and target branches