Merge lp:~javier.collado/utah/invalid_syntax_fix into lp:utah

Proposed by Javier Collado
Status: Rejected
Rejected by: Javier Collado
Proposed branch: lp:~javier.collado/utah/invalid_syntax_fix
Merge into: lp:utah
Diff against target: 11 lines (+1/-1)
1 file modified
utah/provisioning/baremetal/cobbler.py (+1/-1)
To merge this branch: bzr merge lp:~javier.collado/utah/invalid_syntax_fix
Reviewer Review Type Date Requested Status
Javier Collado (community) Disapprove
Review via email: mp+115366@code.launchpad.net

Description of the change

Fixed invalid syntax error found in a recent commit

To post a comment you must log in.
Revision history for this message
Javier Collado (javier.collado) wrote :

I've seen this problem has just been fixed, so I'm rejecting this merge request.

review: Disapprove

Unmerged revisions

430. By Javier Collado

Fixed invalid syntax error

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/provisioning/baremetal/cobbler.py'
2--- utah/provisioning/baremetal/cobbler.py 2012-07-17 14:39:37 +0000
3+++ utah/provisioning/baremetal/cobbler.py 2012-07-17 15:13:24 +0000
4@@ -64,7 +64,7 @@
5 self.logger.debug('Adding kernel boot options to distro')
6 self._cobble(['distro', 'edit', '--name=' + self.cname, '--kopts=' + self.cmdline])
7 self.logger.debug('Adding kernel boot options and kickstart to profile')
8- self._cobble(['distro', 'edit', '--name=' + self.cname, '--kopts=' + self.cmdline, '--kickstart=' + os.path.join(self.tmpdir, 'initrd.d', 'preseed.cfg'])
9+ self._cobble(['distro', 'edit', '--name=' + self.cname, '--kopts=' + self.cmdline, '--kickstart=' + os.path.join(self.tmpdir, 'initrd.d', 'preseed.cfg')])
10 self.logger.debug('Adding system')
11 self._cobble(['system', 'add', '--name=' + self.name, '--profile=' + self.cname, '--netboot-enabled=Y'] + ['--' + arg + '=' +self.cargs(arg) for arg in self.cargs])
12

Subscribers

People subscribed via source and target branches