x/cloud-init
Code Issues Proposed changes

Get the new builddeb working and fix the rules file

Browse Source
This commit is contained in:
Joshua Harlow 2012-06-25 21:51:36 -07:00
parent bcc896deae
commit 832c511e0f
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/bddeb
View File

@ -15,7 +15,8 @@ def tmpdir():
try: try:
yield t yield t
finally: finally:
shutil.rmtree(t) pass
#shutil.rmtree(t)
def join(*paths): def join(*paths):
@ -56,6 +57,10 @@ def archive_code():
def main(): def main():
# cmd = ['apt-get', 'install', 'python-nose',
#'pyflakes', 'python-mocker', 'cdbs', 'debhelper']
# tiny_p(cmd)
with tmpdir() as td: with tmpdir() as td:
(revno, version, bname, archive_fn) = archive_code() (revno, version, bname, archive_fn) = archive_code()
real_archive_fn = os.path.join(td, os.path.basename(archive_fn)) real_archive_fn = os.path.join(td, os.path.basename(archive_fn))
@ -74,6 +79,12 @@ def main():
join(td, 'cloud-init', 'debian', 'changelog')] join(td, 'cloud-init', 'debian', 'changelog')]
tiny_p(cmd) tiny_p(cmd)
# Seems to want an original tar ball
o_tar = "cloud-init_%s~bzr%s.orig.tar.gz" % (version, revno)
cmd = ['tar', '-czf', join(td, o_tar), '-C', join(td, 'cloud-init')]
cmd.extend(os.listdir(join(td, 'cloud-init')))
tiny_p(cmd)
ocwd = os.getcwd() ocwd = os.getcwd()
os.chdir(join(td, 'cloud-init')) os.chdir(join(td, 'cloud-init'))
cmd = ['debuild'] cmd = ['debuild']

1
packages/debian.trunk/rules
View File

@ -10,7 +10,6 @@ include /usr/share/cdbs/1/class/python-distutils.mk
DEB_DH_INSTALL_SOURCEDIR := debian/tmp DEB_DH_INSTALL_SOURCEDIR := debian/tmp
cloud-init-fixups: cloud-init-fixups:
for x in $(DEB_DESTDIR)/usr/bin/*.py; do mv "$$x" "$${x%.py}"; done
install -d $(DEB_DESTDIR)/etc/rsyslog.d install -d $(DEB_DESTDIR)/etc/rsyslog.d
cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf