[PATCH] replace repoinfo.conf on upgrade

[Kamil Paral]

repoinfo.conf (as opposed to autoqa.conf) is not really a configuration
file where the user could set some useful setting. It's more of a
definition file for AutoQA's internal use only. Therefore we move
it from %config(noreplace) behaviour to %config behaviour. That will
save us some trouble when upgrading autoqa (often you forget about
updating repoinfo.conf and then it throws weird error messages, at
best).
---
 Makefile    |    2 +-
 autoqa.spec |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 86c7105..0931a69 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ install: build
 	[ -f $(PREFIX)/etc/cron.d/autoqa ] || install -m 0644 autoqa.cron
$(PREFIX)/etc/cron.d/autoqa
 	install -d $(PREFIX)/etc/autoqa
 	[ -f $(PREFIX)/etc/autoqa/autoqa.conf ] || install -m 0644 autoqa.conf
$(PREFIX)/etc/autoqa/
-	[ -f $(PREFIX)/etc/autoqa/repoinfo.conf ] || install -m 0644 repoinfo.conf
$(PREFIX)/etc/autoqa/
+	install -m 0644 repoinfo.conf $(PREFIX)/etc/autoqa/
 	install -d $(PREFIX)$(HOOK_DIR)
 	for h in hooks/*; do cp -a $$h $(PREFIX)$(HOOK_DIR); done
 	install -d $(PREFIX)$(TEST_DIR)
diff --git a/autoqa.spec b/autoqa.spec
index 540fb00..8e60be8 100644
--- a/autoqa.spec
+++ b/autoqa.spec
@@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README LICENSE TODO
 %config(noreplace) %{_sysconfdir}/cron.d/autoqa
 %config(noreplace) %{_sysconfdir}/autoqa/autoqa.conf
-%config(noreplace) %{_sysconfdir}/autoqa/repoinfo.conf
+%config %{_sysconfdir}/autoqa/repoinfo.conf
 %config(noreplace) %{testdir}/rats_sanity/irb.cfg
 %dir %attr(0775,root,autotest) %{_localstatedir}/cache/autoqa
 %{_sysconfdir}/autoqa
-- 
1.7.1.1

[Kamil Paral]

----- "Kamil Páral" <kparal(a)redhat.com&gt; wrote:

>  repoinfo.conf (as opposed to autoqa.conf) is not really a
>  configuration
>  file where the user could set some useful setting. It's more of a
>  definition file for AutoQA's internal use only. Therefore we move
>  it from %config(noreplace) behaviour to %config behaviour. That will
>  save us some trouble when upgrading autoqa (often you forget about
>  updating repoinfo.conf and then it throws weird error messages, at
>  best).
>  --- 
To tell the truth, there is one item - baseurl - that can be really
seen as a true config item (with noreplace behavior desired). But the 
other stuff is not like that afaict. So we could either decouple it 
somehow, or just forget it right now, apply the patch, and deal with
it when required (a distant future I think).

[Will Woods]

On Mon, 2010-07-12 at 13:01 -0400, Kamil Paral wrote:

>  To tell the truth, there is one item - baseurl - that can be really
>  seen as a true config item (with noreplace behavior desired). But the 
>  other stuff is not like that afaict. So we could either decouple it 
>  somehow, or just forget it right now, apply the patch, and deal with
>  it when required (a distant future I think). 
Yeah, let's just replace the file. If anyone actually maintains their
own autoqa setup where they modify repoinfo.conf, they can talk to us
about that and we'll fix things for them.

Applied to master; thanks!

-w