Bug#922090: Missing eol-server info in ubuntu.csv

2019-04-23 Thread Stefano Rivera
Hi Brian (2019.02.11_14:22:14_-0800)

Sorry for not engaging in this sooner. Unfortunately, it missed Debian's
freeze, and I've been trying to think about what I want to do about
that...

> The ubuntu.csv file is missing eol-server dates for multiple releases of
> Ubuntu (likely because there is not a distinction between EoL dates for
> server and desktop anymore), however this creates the following
> confusing and misleading situation.
> 
> (disco-amd64)root@impulse:~# ubuntu-distro-info --all -r --days=eol-server | 
> grep LTS
> 6.06 LTS -2812
> 8.04 LTS -2104
> 10.04 LTS -1384
> 12.04 LTS (unknown)
> 14.04 LTS (unknown)
> 16.04 LTS (unknown)
> 18.04 LTS (unknown)

I'm not entirely convinced that your proposed solution is the right
thing to do here. As there is no distinction between Desktop and Server
EoLs any more, isn't "unknown" a better response?

I don't have a particularly strong opinion here. But I'm looking at
Debian Buster freeze, and I can't find the motivation to push this
through there.

> Additionally, I will be adding an another column to ubuntu.csv for ESM
> support and having empty values for eol-server, with a new column after
> it, ends up breaking ubuntu-distro-info.

That's a bigger issue, because of the format change, of course. So when
we resolve that in Debian, I'd like to include a new Debian LTS column
(#782685) at the same time.

In the mean-time, Debian and Ubuntu are going to be diverged, I guess :(

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272



Bug#922090: Missing eol-server info in ubuntu.csv

2019-02-11 Thread Brian Murray
Package: distro-info-data
Version: 0.39
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

The ubuntu.csv file is missing eol-server dates for multiple releases of
Ubuntu (likely because there is not a distinction between EoL dates for
server and desktop anymore), however this creates the following
confusing and misleading situation.

(disco-amd64)root@impulse:~# ubuntu-distro-info --all -r --days=eol-server | 
grep LTS
6.06 LTS -2812
8.04 LTS -2104
10.04 LTS -1384
12.04 LTS (unknown)
14.04 LTS (unknown)
16.04 LTS (unknown)
18.04 LTS (unknown)

Additionally, I will be adding an another column to ubuntu.csv for ESM
support and having empty values for eol-server, with a new column after
it, ends up breaking ubuntu-distro-info.

This has also been reported in Launchpad as
http://launchpad.net/bugs/1814976.

Thanks!
--
Brian Murray @ubuntu.com
diff -Nru distro-info-data-0.39/debian/changelog 
distro-info-data-0.40/debian/changelog
--- distro-info-data-0.39/debian/changelog  2018-10-30 06:33:17.0 
-0700
+++ distro-info-data-0.40/debian/changelog  2019-02-11 14:01:01.0 
-0800
@@ -1,3 +1,9 @@
+distro-info-data (0.40) UNRELEASED; urgency=medium
+
+  * Add in eol-server dates for all Ubuntu LTS releases. (LP: #1814976)
+
+ -- Brian Murray   Mon, 11 Feb 2019 14:01:01 -0800
+
 distro-info-data (0.39) unstable; urgency=medium
 
   * Add Ubuntu 19.04 Disco Dingo. (LP: #1800656)
diff -Nru distro-info-data-0.39/ubuntu.csv distro-info-data-0.40/ubuntu.csv
--- distro-info-data-0.39/ubuntu.csv2018-10-30 06:33:17.0 -0700
+++ distro-info-data-0.40/ubuntu.csv2019-02-11 13:47:15.0 -0800
@@ -14,18 +14,18 @@
 10.10,Maverick Meerkat,maverick,2010-04-29,2010-10-10,2012-04-10
 11.04,Natty Narwhal,natty,2010-10-10,2011-04-28,2012-10-28
 11.10,Oneiric Ocelot,oneiric,2011-04-28,2011-10-13,2013-05-09
-12.04 LTS,Precise Pangolin,precise,2011-10-13,2012-04-26,2017-04-26
+12.04 LTS,Precise Pangolin,precise,2011-10-13,2012-04-26,2017-04-26,2017-04-26
 12.10,Quantal Quetzal,quantal,2012-04-26,2012-10-18,2014-05-16
 13.04,Raring Ringtail,raring,2012-10-18,2013-04-25,2014-01-27
 13.10,Saucy Salamander,saucy,2013-04-25,2013-10-17,2014-07-17
-14.04 LTS,Trusty Tahr,trusty,2013-10-17,2014-04-17,2019-04-17
+14.04 LTS,Trusty Tahr,trusty,2013-10-17,2014-04-17,2019-04-17,2019-04-17
 14.10,Utopic Unicorn,utopic,2014-04-17,2014-10-23,2015-07-23
 15.04,Vivid Vervet,vivid,2014-10-23,2015-04-23,2016-01-23
 15.10,Wily Werewolf,wily,2015-04-23,2015-10-22,2016-07-22
-16.04 LTS,Xenial Xerus,xenial,2015-10-22,2016-04-21,2021-04-21
+16.04 LTS,Xenial Xerus,xenial,2015-10-22,2016-04-21,2021-04-21,2021-04-21
 16.10,Yakkety Yak,yakkety,2016-04-21,2016-10-13,2017-07-20
 17.04,Zesty Zapus,zesty,2016-10-13,2017-04-13,2018-01-13
 17.10,Artful Aardvark,artful,2017-04-13,2017-10-19,2018-07-19
-18.04 LTS,Bionic Beaver,bionic,2017-10-19,2018-04-26,2023-04-26
+18.04 LTS,Bionic Beaver,bionic,2017-10-19,2018-04-26,2023-04-26,2023-04-26
 18.10,Cosmic Cuttlefish,cosmic,2018-04-26,2018-10-18,2019-07-18
 19.04,Disco Dingo,disco,2018-10-18,2019-04-18,2020-01-18
diff -Nru distro-info-data-0.39/validate-csv-data 
distro-info-data-0.40/validate-csv-data
--- distro-info-data-0.39/validate-csv-data 2018-10-30 06:33:17.0 
-0700
+++ distro-info-data-0.40/validate-csv-data 2019-02-11 13:55:17.0 
-0800
@@ -108,7 +108,7 @@
 if date2 in row and row[date2]:
 if date1 in row and row[date1]:
 # date1 needs to be earlier than date2
-if row[date1] >= row[date2]:
+if row[date1] > row[date2]:
 msg = ("Date %s of column `%s' needs to be later "
"than %s of column `%s'")
 error(filename, csvreader.line_num, msg,