To fix this bug [1], I have to revert an old commit from the SLE branches, leaving it in openSUSE.
I'm not sure what to do with the version numbers.
Version in master is 3.11.1 and includes the fix TW that should be reverted for SLE [2].
Version in SLE-12-GA is 3.11.1.1, which is the same as above (everything was recently backported) plus adjustements needed to build and run in SLE-12-GA [3].
Now I need to branch SLE12-SP1 from master. Master will stay as it is and the mentioned fix will be reverted in two branches: SLE-12-GA and SLE-12-SP1.
That will lead to version 3.11.1.2 in SLE-12-GA but... which version number should I use in the SLE-12-SP1 branch?
[1] https://bugzilla.suse.com/show_bug.cgi?id=946889 [2] https://github.com/yast/yast-security/blob/master/package/yast2-security.cha... [3] https://github.com/yast/yast-security/blob/SLE-12-GA/package/yast2-security....
-- Ancor González Sosa YaST Team at SUSE Linux GmbH
Dne 22.9.2015 v 18:50 Ancor Gonzalez Sosa napsal(a): [...]
That will lead to version 3.11.1.2 in SLE-12-GA but... which version number should I use in the SLE-12-SP1 branch?
The version in SLE-12-SP1 must be greater than any (future) version in SLE-12-GA to correctly update the package during upgrade from GA to SP1 (otherwise the solver would keep the old version).
That means the version must be 3.11.2 in SLE-12-SP1.
To solve the version conflict with TW increase the version in master to 3.12.0. That will also indicate that the package is not compatible with SLE12 and it should help to avoid submitting the package to SLE12 by mistake...
(Don't forget also to change the Jenkins autosubmitting for SLE-12-SP1.)
--
Best Regards
Ladislav Slezák Yast Developer ------------------------------------------------------------------------ SUSE LINUX, s.r.o. e-mail: lslezak@suse.cz Lihovarská 1060/12 tel: +420 284 028 960 190 00 Prague 9 fax: +420 284 028 951 Czech Republic http://www.suse.cz/
On 09/22/2015 11:19 PM, Ladislav Slezak wrote:
Dne 22.9.2015 v 18:50 Ancor Gonzalez Sosa napsal(a): [...]
That will lead to version 3.11.1.2 in SLE-12-GA but... which version number should I use in the SLE-12-SP1 branch?
The version in SLE-12-SP1 must be greater than any (future) version in SLE-12-GA to correctly update the package during upgrade from GA to SP1 (otherwise the solver would keep the old version).
That means the version must be 3.11.2 in SLE-12-SP1.
That will collide to what I was expecting to do for SLE-12-GA.
Now we have SLE-12-GA: 3.1.11.1 SLE-12-SP1: 3.1.11 Master: 3.1.12
Your suggestion SLE-12-GA: ?? I need to increase this one. SLE-12-SP1: 3.1.11.2 Master: 3.1.12
I guess you actually meant SLE-12-GA: 3.1.11.2 SLE-12-SP1: 3.1.12.1 Master: 3.1.12
Isn't it?
On 09/23/2015 03:20 PM, Ancor Gonzalez Sosa wrote:
On 09/22/2015 11:19 PM, Ladislav Slezak wrote:
Dne 22.9.2015 v 18:50 Ancor Gonzalez Sosa napsal(a): [...]
That will lead to version 3.11.1.2 in SLE-12-GA but... which version number should I use in the SLE-12-SP1 branch?
The version in SLE-12-SP1 must be greater than any (future) version in SLE-12-GA to correctly update the package during upgrade from GA to SP1 (otherwise the solver would keep the old version).
That means the version must be 3.11.2 in SLE-12-SP1.
That will collide to what I was expecting to do for SLE-12-GA.
Now we have SLE-12-GA: 3.1.11.1 SLE-12-SP1: 3.1.11 Master: 3.1.12
Master: 3.1.11, I meant
Your suggestion SLE-12-GA: ?? I need to increase this one. SLE-12-SP1: 3.1.11.2 Master: 3.1.12
I guess you actually meant SLE-12-GA: 3.1.11.2 SLE-12-SP1: 3.1.12.1 Master: 3.1.12
Isn't it?
Dne 23.9.2015 v 15:22 Ancor Gonzalez Sosa napsal(a):
Now we have SLE-12-GA: 3.1.11.1 SLE-12-SP1: 3.1.11 Master: 3.1.12
Master: 3.1.11, I meant
OK, this summary makes it better...
So I'd propose this:
SLE-12-GA: 3.1.11.1 (3.1.11.2, 3.1.11.3, ...) SLE-12-SP1: 3.1.12 (3.1.13, 3.1.14, ...) master: 3.2.0 (3.2.1, 3.2.2, ...)
Does it make sense for you?
--
Best Regards
Ladislav Slezák Yast Developer ------------------------------------------------------------------------ SUSE LINUX, s.r.o. e-mail: lslezak@suse.cz Lihovarská 1060/12 tel: +420 284 028 960 190 00 Prague 9 fax: +420 284 028 951 Czech Republic http://www.suse.cz/
On 09/23/2015 09:06 PM, Ladislav Slezak wrote:
Dne 23.9.2015 v 15:22 Ancor Gonzalez Sosa napsal(a):
Now we have SLE-12-GA: 3.1.11.1 SLE-12-SP1: 3.1.11 Master: 3.1.12
Master: 3.1.11, I meant
OK, this summary makes it better...
So I'd propose this:
SLE-12-GA: 3.1.11.1 (3.1.11.2, 3.1.11.3, ...) SLE-12-SP1: 3.1.12 (3.1.13, 3.1.14, ...) master: 3.2.0 (3.2.1, 3.2.2, ...)
Does it make sense for you?
It does... and it's indeed the obvious solution.
Thanks a lot.
Dne 23.9.2015 v 21:18 Ancor Gonzalez Sosa napsal(a):
SLE-12-GA: 3.1.11.1 (3.1.11.2, 3.1.11.3, ...) SLE-12-SP1: 3.1.12 (3.1.13, 3.1.14, ...) master: 3.2.0 (3.2.1, 3.2.2, ...)
Does it make sense for you?
It does... and it's indeed the obvious solution.
Thanks a lot.
You are welcome!
--
Best Regards
Ladislav Slezák Yast Developer ------------------------------------------------------------------------ SUSE LINUX, s.r.o. e-mail: lslezak@suse.cz Lihovarská 1060/12 tel: +420 284 028 960 190 00 Prague 9 fax: +420 284 028 951 Czech Republic http://www.suse.cz/
-
Ancor Gonzalez Sosa -
Ladislav Slezak