fnux/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

catch some errors

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2014-09-14 13:51:13 +02:00
commit 339167c23c
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cdist/preos.py
View file

@ -148,14 +148,17 @@ cp -L "$src" "$real_dst"
log.debug("Bootstrap: %s" % cmd) log.debug("Bootstrap: %s" % cmd)
# try: try:
subprocess.check_call(cmd) subprocess.check_call(cmd)
# except subprocess.CalledProcessError: except subprocess.CalledProcessError:
# raise raise cdist.Error("Debootstrap failed (root priviliges required)")
# Required to run this - otherwise apt-get install fails # Required to run this - otherwise apt-get install fails
cmd = [ "chroot", self.target_dir, "/usr/bin/apt-get", "update" ] cmd = [ "chroot", self.target_dir, "/usr/bin/apt-get", "update" ]
subprocess.check_call(cmd) try:
subprocess.check_call(cmd)
except subprocess.CalledProcessError:
raise cdist.Error("chrooted apt-get update failed (root priviliges required)")
def create_helper_files(self, base_dir): def create_helper_files(self, base_dir):
for key, val in self.helper.items(): for key, val in self.helper.items():