Commit b1fbe13b authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Merge branch 'master' of https://code.grnet.gr/git/synnefo

parents c64e1871 9c1214d6
......@@ -204,6 +204,9 @@ def dch(p):
if True:
# Run git-dch in snapshot mode.
# TODO: Support a --release mode in fabfile
if not env.debrelease:
notice(("Producing snapshot changelog entry, "
"use 'debrelease' to produce release entries."))
local(("git-dch --debian-branch=%s --auto %s" %
(env.debian_branch,
"--release" if env.debrelease else "--snapshot")))
......@@ -215,6 +218,12 @@ def dch(p):
local("rmdir .git")
def dchall():
for p in env.deb_packages:
info("updating debian changelog for package: %s" % p)
dch(p)
def debrelease():
env.debrelease = True
......@@ -254,7 +263,6 @@ def builddeball(b="debian-0.8"):
builddeb(p=p, branch=b)
@roles('pypi')
def uploadtars():
put("packages/*.tar.gz", 'www/pypi/')
......@@ -265,9 +273,9 @@ def cleandocs():
Remove _build directories for each doc project
"""
# snf-docs contains conf.py in root directory
if os.path.exists("snf-docs/docs/_build"):
local("rm -r snf-docs/docs/_build")
# docs contains conf.py in root directory
if os.path.exists("docs/docs/_build"):
local("rm -r docs/docs/_build")
for p in env.packages:
buildpth = os.path.join(package_root(p), 'docs', '_build')
......@@ -281,8 +289,8 @@ def builddocs():
"""
builddocs_cmd = "sphinx-build -b html -d _build/doctrees . _build/html"
# snf-docs contains conf.py in root directory
with lcd("snf-docs"):
# docs contains conf.py in root directory
with lcd("docs"):
local(builddocs_cmd)
for p in env.packages:
......
......@@ -190,7 +190,7 @@ def get_backend_image(image_id, owner):
backend = ImageBackend(owner.uniq)
try:
image = backend.get_image(image_id)
if not image:
if not image or image['deleted_at']:
raise ItemNotFound('Image not found.')
return image
finally:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment