Red Hat Bugzilla – Bug 1031908
/usr/share/spin-kickstarts/fedora-live-design-suite.ks has extraneous text
Last modified: 2013-11-30 13:46:29 EST
Description of problem: I'm building a live ISO based on /usr/share/spin-kickstarts/fedora-live-design-suite.ks. In the process of building, it throws an error:
/tmp/ks-script-a7fiv8: line 22: syntax error near unexpected token `<<<'
/tmp/ks-script-a7fiv8: line 22: `<<<<<<< HEAD'
ignoring %post failure (code 2)
So I looked at the file and there is something that looks like an incomplete git merge in it:
122 <<<<<<< HEAD
124 # Add link to the list of design tutorials
125 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
126 [Desktop Entry]
127 Name=List of design tutorials
128 GenericName=Design tutorials
129 Comment=List of websites using open source design software
130 Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
135 chmod a+x /usr/share/applications/list-design-tutorials.desktop
137 >>>>>>> 6d05550... design: fix link for tutorials
138 # rebuild schema cache with any overrides we installed
139 glib-compile-schemas /usr/share/glib-2.0/schemas
Version-Release number of selected component (if applicable):
$ rpm -q --whatprovides /usr/share/spin-kickstarts/fedora-live-design-suite.ks
I can confirm this. :( We can fix it in the next package update...
In the mean time you can just get it from git:
So is this already fixed in git?
I am probably going to do a new build this weekend. And if things change after that we might do yet another update before final. So there should be a new package soon.
It's still not quite right in git. I downloaded git://git.fedorahosted.org/git/spin-kickstarts.git and used the fedora-live-design-suite.ks from that repo. It still throws an error:
/tmp/ks-script-ljZQkI: line 38: EOF: command not found
ignoring %post failure (code 127)
It looks like the EOF at line 136 shouldn't be there:
133 # rebuild schema cache with any overrides we installed
134 glib-compile-schemas /usr/share/glib-2.0/schemas
There's no '<< EOF' earlier in the file.
So spin-kickstarts.git has broken git merge. Looking at the ks file, I noticed the incomplete git merge is still present. That part is removed and you should be able to use fedora-live-design-suite.ks from F20 branch.
Take a look at ks and see if there is any mistake:
I didn't get to this one this past weekend, but will try to look at it soon. It probably needs a bit more investigation, as there really should be few merges occurring and I worry about someone trying to merge master into f20 and breaking things. But maybe it was someone who didn't do a rebase when the repo changed while they were doing development.
(In reply to Luya Tshimbalanga from comment #4)
> So spin-kickstarts.git has broken git merge. Looking at the ks file, I
> noticed the incomplete git merge is still present. That part is removed and
> you should be able to use fedora-live-design-suite.ks from F20 branch.
> Take a look at ks and see if there is any mistake:
Yes ,,, as far as I can tell the EOF at line 141 in https://git.fedorahosted.org/cgit/spin-kickstarts.git/tree/fedora-live-design-suite.ks?h=f20 should not be there. The question is what effect does this have on the design spin produced by the build processes?
I can fix it in my own work (building a Fedora remix based on this kickstart file) but is the build process for the design spin "silently" failing to do what the kickstart file's maintainers intend it to do? It looks to me like this section of code is intended to change the menu that shows up when you boot up the design spin. Is that changed menu in fact appearing?
Yes the changed menu appears after installation which is the intended effect. I commented the EOF part which was there prior of taking over the ownership of design-suite.ks. I did not know EOF should not there.
Try to build with the updated ks file and let know if there is any error. If it works I remove that part on the master as the final release of F20 is coming. Thank you.
Closing this report as the bug is fixed with the removal incomplete git commit.