kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix error with applying azure/assets/udev.diff

Browse source 
When creating an image for Azure we see the following error when applying udev.diff:

   TypeError: cannot concatenate 'str' and 'file' objects

Resolving this in log_call() I still see the following error:

   patch: **** Only garbage was found in the patch input.

So fixing this in providers/azure/tasks/boot.py seems to be the best route.
This commit is contained in:
Stephen A. Zarkos 2015-07-29 19:05:03 +00:00
parent 608de63d3e
commit 6b2a5cb4a5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrapvz/providers/azure/tasks/boot.py
View file

@ -15,9 +15,9 @@ class PatchUdev(Task):
from bootstrapvz.common.tools import log_check_call from bootstrapvz.common.tools import log_check_call
from . import assets from . import assets
# c.f. http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/commit/?id=61e055638cea # c.f. http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/commit/?id=61e055638cea
with open(os.path.join(assets, 'udev.diff')) as diff_file: diff_file = file.read(open(os.path.join(assets, 'udev.diff'), 'r'))
udev_dir = os.path.join(info.root, 'usr/share/initramfs-tools/scripts/init-top') udev_dir = os.path.join(info.root, 'usr/share/initramfs-tools/scripts/init-top')
log_check_call(['patch', '--no-backup-if-mismatch', '-p6', '-d' + udev_dir], stdin=diff_file) log_check_call(['patch', '--no-backup-if-mismatch', '-p6', '-d' + udev_dir], stdin=diff_file)
class ConfigureGrub(Task): class ConfigureGrub(Task):