summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-06-29 13:58:36 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-06-29 13:58:36 -0700
commitac2e5d322e92a9cdf5a94d4cc4f7f6daa1137f07 (patch)
tree2cc3efd781528748755add06ae601b77fb7b1276
parent1779967ec7aa4e6ebfdd176b8b98edb6f3470242 (diff)
parent9bb44707c1ae45574a83ea1409d53b762db912c9 (diff)
downloadvyos-cloud-init-ac2e5d322e92a9cdf5a94d4cc4f7f6daa1137f07.tar.gz
vyos-cloud-init-ac2e5d322e92a9cdf5a94d4cc4f7f6daa1137f07.zip
Why is this asking me about this...
-rwxr-xr-xpackages/bddeb5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/bddeb b/packages/bddeb
index b10f5a8e..eeb64434 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -3,6 +3,7 @@
import os
import shutil
import sys
+import glob
# Use the util functions from cloudinit
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
@@ -123,7 +124,7 @@ def main():
util.abs_join(tdir, tar_fn),
'-C', util.abs_join(tdir, 'cloud-init')]
cmd.extend(os.listdir(util.abs_join(tdir, 'cloud-init')))
- util.subp(cmd)
+ util.subp(cmd, capture=capture)
shutil.copy(util.abs_join(tdir, tar_fn), tar_fn)
print("Wrote out archive %r" % (util.abs_join(tar_fn)))
@@ -143,7 +144,7 @@ def main():
if fn.endswith('_all.deb'):
# Add in the local link
util.del_file('cloud-init_all.deb')
- util.symlink(base_fn, 'cloud-init_all.deb')
+ os.symlink(base_fn, 'cloud-init_all.deb')
return 0