Bug 1031908 - /usr/share/spin-kickstarts/fedora-live-design-suite.ks has extraneous text
Summary: /usr/share/spin-kickstarts/fedora-live-design-suite.ks has extraneous text
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: spin-kickstarts
Version: 20
Hardware: x86_64
OS: Linux
unspecified
high
Target Milestone: ---
Assignee: Jeroen van Meeuwen
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2013-11-19 06:16 UTC by M. Edward (Ed) Borasky
Modified: 2013-11-30 18:46 UTC (History)
6 users (show)

Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Clone Of:
Environment:
Last Closed: 2013-11-30 18:46:29 UTC
Type: Bug
Embargoed:


Attachments (Terms of Use)

Description M. Edward (Ed) Borasky 2013-11-19 06:16:59 UTC
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:

    121 
    122 <<<<<<< HEAD
    123 =======
    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
    131 Type=Application
    132 Icon=applications-graphics
    133 Categories=Graphics;Documentation;
    134 FOE
    135 chmod a+x /usr/share/applications/list-design-tutorials.desktop
    136 
    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 
fedora-kickstarts-0.20.20-1.fc20.noarch

Comment 1 Kevin Fenzi 2013-11-19 23:07:32 UTC
I can confirm this. :( We can fix it in the next package update...

In the mean time you can just get it from git: 

git://git.fedorahosted.org/git/spin-kickstarts.git

Comment 2 Bruno Wolff III 2013-11-20 00:38:49 UTC
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.

Comment 3 M. Edward (Ed) Borasky 2013-11-25 07:01:38 UTC
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
    135 
    136 EOF

There's no '<< EOF' earlier in the file.

Comment 4 Luya Tshimbalanga 2013-11-25 19:11:55 UTC
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:
https://git.fedorahosted.org/cgit/spin-kickstarts.git/tree/fedora-live-design-suite.ks?h=f20

Comment 5 Bruno Wolff III 2013-11-25 19:19:24 UTC
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.

Comment 6 M. Edward (Ed) Borasky 2013-11-25 19:33:15 UTC
(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:
> https://git.fedorahosted.org/cgit/spin-kickstarts.git/tree/fedora-live-
> design-suite.ks?h=f20

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?

Comment 7 Luya Tshimbalanga 2013-11-25 22:59:12 UTC
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.

https://git.fedorahosted.org/cgit/spin-kickstarts.git/tree/fedora-live-design-suite.ks?h=f20

Comment 8 Luya Tshimbalanga 2013-11-30 18:46:29 UTC
Closing this report as the bug is fixed with the removal incomplete git commit.


Note You need to log in before you can comment on or make changes to this bug.