Hello community,
here is the log from the commit of package netcfg for openSUSE:Factory checked
in at 2014-12-19 09:38:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcfg (Old)
and /work/SRC/openSUSE:Factory/.netcfg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcfg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcfg/netcfg.changes 2014-12-03
22:53:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.netcfg.new/netcfg.changes 2014-12-19
09:37:03.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Dec 17 10:32:15 UTC 2014 - tchva...@suse.com
+
+- Try different approach to fix failing migration from 13.1.
+ This one is from locilka
+
+-------------------------------------------------------------------
+Wed Dec 17 10:19:29 UTC 2014 - tchva...@suse.com
+
+- Keep the condition posix as it is shorter :)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcfg.spec ++++++
--- /var/tmp/diff_new_pack.pCclBj/_old 2014-12-19 09:37:05.000000000 +0100
+++ /var/tmp/diff_new_pack.pCclBj/_new 2014-12-19 09:37:05.000000000 +0100
@@ -77,15 +77,12 @@
# If hostname and HOSTNAME both exist HOSTNAME wins.
# Nothing apart from content of the document is preserved
# REMOVE after SLE11/openSUSE-13.1 out of MIGRATION support
-if [ "0$1" -ge "2" ]; then
+if [ $1 -gt 1 ]; then
if [ -f %{_sysconfdir}/HOSTNAME -a ! -L %{_sysconfdir}/HOSTNAME ]; then
- cp %{_sysconfdir}/HOSTNAME %{_sysconfdir}/hostname.rpmsave
- rm %{_sysconfdir}/HOSTNAME
- fi
- # As some people are really on pills and did the link themselves other
- # way around ensure the package will install for them.
- if [ -f %{_sysconfdir}/hostname -a -f %{_sysconfdir}/hostname.rpmsave ]; then
- rm %{_sysconfdir}/hostname
+ cat %{_sysconfdir}/HOSTNAME > %{_sysconfdir}/hostname.rpmsave
+ rm -rf %{_sysconfdir}/HOSTNAME %{_sysconfdir}/hostname
+ touch %{_sysconfdir}/hostname
+ ln -s %{_sysconfdir}/hostname %{_sysconfdir}/HOSTNAME
fi
fi
exit 0
@@ -93,13 +90,12 @@
%post
# If the defaultdomain changed just prune it, user is not interested in
# 0 size file anyway
-if [ -f etc/defaultdomain.rpmnew ]; then
- rm -f etc/defaultdomain.rpmnew
+if [ -f %{_sysconfdir}/defaultdomain.rpmnew ]; then
+ rm -f %{_sysconfdir}/defaultdomain.rpmnew
fi
-
-# Put backuped HOSTNAME into the current hostname file
if [ -f %{_sysconfdir}/hostname.rpmsave ]; then
- mv %{_sysconfdir}/hostname.rpmsave %{_sysconfdir}/hostname
+ cat %{_sysconfdir}/hostname.rpmsave > %{_sysconfdir}/hostname
+ rm -rf %{_sysconfdir}/HOSTNAME.rpmsave %{_sysconfdir}/hostname.rpmsave
fi
exit 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
