Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 586394 - [kde overlay] kde-plasma/plasma-workspace-5.6.95 - faulty startup script prohibits login
Summary: [kde overlay] kde-plasma/plasma-workspace-5.6.95 - faulty startup script proh...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] KDE (show other bugs)
Hardware: All Linux
: Normal major (vote)
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-06-19 16:02 UTC by vltg0903
Modified: 2016-06-19 16:10 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description vltg0903 2016-06-19 16:02:09 UTC
A script in kde-plasma/plasma-workspace called 

/etc/plasma/startup/10-agent-startup.sh

reads in part

####################################

<<<<<<< Updated upstream
                        eval "$(/usr/bin/gpg-agent --enable-ssh-support --daemon)"
=======
                        eval "$(/usr/bin/gpg-agent --daemon)"
>>>>>>> Stashed changes

################################

which of course fails on execution and makes login into the plasma desktop impossible. I've commented out all but the first eval statement which works for me, not that I know which one of those is supposed to be the updated one and what the difference is.

Reproducible: Always
Comment 1 vltg0903 2016-06-19 16:03:27 UTC
The package version is kde-plasma/plasma-workspace-5.6.95, I should add.
Comment 2 Michael Palimaka (kensington) gentoo-dev 2016-06-19 16:10:30 UTC
Thanks.

This was fixed previously, but I didn't realise that it caused startup to fail completely so I've revbumped it now to ensure the fix is propagated. 

https://gitweb.gentoo.org/proj/kde.git/commit/?id=54f2348de8aed0a30960a340bbd762196da488a2
https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a51a460d445f6f003c53f3600756f3a25377fc6