Revision 77bdcdd0

b/fabfile.py
54 54
}
55 55

  
56 56

  
57
# coloured logging
57
# colored logging
58 58
notice = lambda x: sys.stdout.write(yellow(x) + "\n")
59 59
info = lambda x: sys.stdout.write(green(x) + "\n")
60 60
error = lambda x: sys.stdout.write(red(x) + "\n")
......
115 115
    for p in env.packages:
116 116
        install_pkg(p)
117 117

  
118

  
118 119
def collectdists():
119 120
    if os.path.exists("./packages"):
120 121
        notice("removing 'packages' directory")
......
124 125
    for p in env.packages:
125 126
        local("cp %s/dist/*.tar.gz ./packages/" % package_root(p));
126 127

  
128

  
127 129
def removeall():
128 130
    for p in env.packages:
129 131
        remove_pkg(p)
......
162 164

  
163 165
env.debian_branch = 'debian-0.8'
164 166

  
167

  
165 168
def _last_commit(f):
166 169
    return local("git rev-list --all --date-order --max-count=1 %s" % f,
167 170
            capture=True).strip()
168 171

  
172

  
169 173
def _diff_from_master(c,f):
170 174
    return local("git log --oneline %s..master %s" \
171 175
                 " | wc -l" % (c, f), capture=True)
172 176

  
177

  
173 178
def dch(p):
174 179
    with co(env.debian_branch):
175 180
        local("git merge master")
......
189 194

  
190 195
            local("rm -r .git")
191 196

  
197

  
192 198
def builddeb(p, master="master", branch="debian-0.8"):
193 199
    with lcd(package_root(p)):
194 200
        local("git merge master")
......
214 220
    for p in env.deb_packages:
215 221
        local("cp %s/%s*.deb ./packages/" % (build_area, p))
216 222

  
223

  
217 224
@roles('pypi')
218 225
def uploadtars():
219 226
    put("packages/*.tar.gz", 'www/pypi/')

Also available in: Unified diff