Please read this before reporting a bug:
https://wiki.archlinux.org/title/Bug_reporting_guidelines
Do NOT report bugs when a package is just outdated, or it is in the AUR. Use the 'flag out of date' link on the package page, or the Mailing List.
REPEAT: Do NOT report bugs for outdated packages!
https://wiki.archlinux.org/title/Bug_reporting_guidelines
Do NOT report bugs when a package is just outdated, or it is in the AUR. Use the 'flag out of date' link on the package page, or the Mailing List.
REPEAT: Do NOT report bugs for outdated packages!
FS#49190 - [gitlab-shell] Pacman file conflicts
Attached to Project:
Community Packages
Opened by Simon Hanna (simonsmiley) - Tuesday, 03 May 2016, 12:53 GMT
Last edited by Sven-Hendrik Haase (Svenstaro) - Wednesday, 04 May 2016, 03:56 GMT
Opened by Simon Hanna (simonsmiley) - Tuesday, 03 May 2016, 12:53 GMT
Last edited by Sven-Hendrik Haase (Svenstaro) - Wednesday, 04 May 2016, 03:56 GMT
|
DetailsDescription:
package contains files that overwrite local configuration Steps to reproduce: When I try to update gitlab-shell from 2.7.2-1 to 2.7.2-3 I get the following output gitlab-shell: /var/lib/gitlab/.gitconfig exists in filesystem gitlab-shell: /var/lib/gitlab/.ssh/authorized_keys exists in filesystem authorized_keys contains entries for all ssh-keys that were put on the server and .gitconfig contains a configured email address. |
This task depends upon
Closed by Sven-Hendrik Haase (Svenstaro)
Wednesday, 04 May 2016, 03:56 GMT
Reason for closing: Fixed
Wednesday, 04 May 2016, 03:56 GMT
Reason for closing: Fixed
Comment by Sven-Hendrik Haase (Svenstaro) -
Tuesday, 03 May 2016, 13:41 GMT
Ok, please move your /var/lib/gitlab/.ssh/authorized_keys to /etc/webapps/gitlab-shell/authorized_keys and your /var/lib/gitlab/.gitconfig to /etc/webapps/gitlab-shell/gitconfig. Also back them up in the process. Rel -5 should properly handle your case.