PR#910: frontend: reset %defattr for proper part of %files - copr/copr

copr / copr

#910 frontend: reset %defattr for proper part of %files

Merged 4 years ago by praiskup. Opened 4 years ago by praiskup.

Unknown source defattr into master

frontend: reset %defattr for proper part of %files

Pavel Raiskup • 4 years ago

8f5ad93

frontend/copr-frontend.spec

file modified

+5 -4

		`@@ -330,10 +330,11 @@`
		`%config(noreplace) %{_sysconfdir}/copr/copr_devel.conf`
		`%config(noreplace) %{_sysconfdir}/copr/copr_unit_test.conf`

		`- %config %attr(0755, root, root) %{_sysconfdir}/cron.hourly/copr-frontend`
		`- %config %attr(0755, root, root) %{_sysconfdir}/cron.daily/copr-frontend`
		`- %config(noreplace) %attr(0755, root, root) %{_sysconfdir}/cron.hourly/copr-frontend-optional`
		`- %config(noreplace) %attr(0755, root, root) %{_sysconfdir}/cron.daily/copr-frontend-optional`
		`+ %defattr(-, root, root, -)`
		`+ %config %{_sysconfdir}/cron.hourly/copr-frontend`
		`+ %config %{_sysconfdir}/cron.daily/copr-frontend`
		`+ %config(noreplace) %{_sysconfdir}/cron.hourly/copr-frontend-optional`
		`+ %config(noreplace) %{_sysconfdir}/cron.daily/copr-frontend-optional`
		`%{_libexecdir}/copr_dump_db.sh`
		`%exclude_files flavor`
		`%exclude_files devel`

praiskup commented 4 years ago

The previous %defattr caused that executable files (cron.d,
libexec) dropped executable bits, and we had to re-set the
executable bit per each file. And since we forgot to set
executable bit explicitly for copr_dump_db.sh, the installation
was broken.

frostyx commented 4 years ago

Ha, then maybe d4b638bb8 in ansible repo can be reverted?

frostyx commented 4 years ago

LGTM

msuchy commented 4 years ago

praiskup commented 4 years ago

Ha, then maybe d4b638bb8 in ansible repo can be reverted?

The file is IMO created from scratch by ansible; so we probably can not change that. It would be slightly better to use

 - name: install hourly custom copr-frontend-crontab
   copy: src=cron.hourly/copr-frontend-optional dest=/etc/cron.hourly/
+        mode=755
   tags: [cron_tasks]

in tasks/main.yml instead, but we still need to make sure that the file is executable.

praiskup commented 4 years ago

[copr-build]

praiskup commented 4 years ago

[copr-build]

praiskup commented 4 years ago

[copr-build]

praiskup commented 4 years ago

[copr-build]

rebased onto 8f5ad93

4 years ago

Pull-Request has been merged by praiskup