kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 09:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #495 from andrewbogott/fix-escapes

Browse source 
Fix a couple of (presumed) issues with regex escaping.
This commit is contained in:
Anders Ingemann 2019-03-05 22:19:16 +01:00 • committed by GitHub
commit 012f21f2a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrapvz/plugins/puppet/tasks.py
View file

@ -147,7 +147,7 @@ class ApplyPuppetManifest(Task):
log_check_call(['chroot', info.root, 'puppet', 'apply', '--verbose', '--debug', manifest_path]) log_check_call(['chroot', info.root, 'puppet', 'apply', '--verbose', '--debug', manifest_path])
os.remove(manifest_dst) os.remove(manifest_dst)
hosts_path = os.path.join(info.root, 'etc/hosts') hosts_path = os.path.join(info.root, 'etc/hosts')
sed_i(hosts_path, '127.0.0.1\\s*{hostname}\n?'.format(hostname=hostname), '') sed_i(hosts_path, r'127.0.0.1\s*{hostname}\n?'.format(hostname=hostname), '')
class EnableAgent(Task): class EnableAgent(Task):

2
bootstrapvz/providers/ec2/tasks/boot.py
View file

@ -53,7 +53,7 @@ class CreatePVGrubCustomRule(Task):
grub_device = 'GRUB_DEVICE=/dev/xvda' + str(root_idx) grub_device = 'GRUB_DEVICE=/dev/xvda' + str(root_idx)
sed_i(script_dst, '^GRUB_DEVICE=/dev/xvda$', grub_device) sed_i(script_dst, '^GRUB_DEVICE=/dev/xvda$', grub_device)
grub_root = '\troot (hd0,{idx})'.format(idx=root_idx - 1) grub_root = '\troot (hd0,{idx})'.format(idx=root_idx - 1)
sed_i(script_dst, '^\troot \\(hd0\\)$', grub_root) sed_i(script_dst, r'^\troot \(hd0\)$', grub_root)
if info.manifest.volume['backing'] == 's3': if info.manifest.volume['backing'] == 's3':
from bootstrapvz.common.tools import sed_i from bootstrapvz.common.tools import sed_i