Merge lp:~raphink/ubuntu-maintenance-check/mybranch into lp:ubuntu-maintenance-check

[Raphaël Pinson]

[Raphaël Pinson (raphink)]

Hi Nick,

I've merged the version you sent me on pastebin. Just had to fix a bug in getopt, where a semi-colon was missing for option f. You probably used it for S and forgot to add it back to f.

Additionally, I've added another option -D|--date, which displays the maximum supported date for each package instead of the support time.

Finally, I've refactored quite a bit of the code to make it more easily extensible to new releases. This tries to guess as many parameters as possible from the release version. In the end, it should be easy to just store an array with release names and versions in the beginning of the file.

Cheers,

Raphaël

[lp:~raphink/ubuntu-maintenance-check/mybranch]

26. By Raphaël Pinson <raphink@rpinson> on 2009-09-17

Fix dapper in get_date

[Nick Barcet (nijaba)]

Thanks a lot Raphaël very useful additions and simplifications.

review: Approve

=== modified file 'maintenance-check'
--- maintenance-check	2009-04-15 09:20:46 +0000
+++ maintenance-check	2009-09-17 09:03:02 +0000
@@ -43,6 +43,8 @@
                         s - ubuntu server
 -v, --verbose       Turn on verbose mode.
 -d, --download      Download seeds even if cache exists.
+-S, --source        Specify an alternate location for seeds.
+-D, --date          Show maximum supported dates instead of support time. 
 
 maintenance-check is Copyright (C) 2007-2009 Canonical Ltd. and
 written by Nick Barcet <[e-mail]> and
@@ -54,8 +56,10 @@
 download=""
 filter=""
 allmaint=""
+showdate=""
+usource="http://people.ubuntu.com/~ubuntu-archive/germinate-output"
 
-TEMP=`getopt -o hvdaf: --long help,verbose,download,all,filter:,  -- "$@"`
+TEMP=`getopt -o hvdaf:S:D --long help,verbose,download,all,filter:,source:,date,  -- "$@"`
 eval set -- "$TEMP"
 
 while true
@@ -89,6 +93,14 @@
         allmaint=1
         shift
     ;;
+    -S|--source)
+        usource=$2
+        shift 2
+    ;;
+    -D|--date)
+        showdate=1
+        shift
+    ;;
     --)
         shift || true
         break
@@ -215,28 +227,52 @@
         if echo "$line" | egrep -q "^linux-(headers|image|restricted|ubuntu)-"; then
             if echo "$line" | egrep -q -- "-(imx51|ixp4xx|versatile|lpia|generic)$"; then
                 seeds="${seeds}${seeds:+, }Kernels"
-                maint=${umaint}
+                if [ ! -n "$showdate" ]; then
+                   maint=${umaint}
+                else
+                   maint=${udmaint}
+                fi
             elif echo "$line" | egrep -q -- "-(virtual|server)$"; then
                 seeds="${seeds}${seeds:+, }Kernels"
-                maint=${smaint}
+                if [ ! -n "$showdate" ]; then
+                   maint=${smaint}
+                else
+                   maint=${sdmaint}
+                fi
             fi
         fi
 
         if grep -q "^$line$" "$CACHEDIR/$1.supported.pkgs"; then
             seeds="${seeds}${seeds:+, }Supported"
-            maint=${amaint}
+            if [ ! -n "$showdate" ]; then
+               maint=${amaint}
+            else
+               maint=${admain}
+            fi
         fi
         if grep -q "^$line$" "$CACHEDIR/$1.kubuntu.pkgs"; then
             seeds="${seeds}${seeds:+, }Kubuntu"
-            maint=${kmaint}
+            if [ ! -n "$showdate" ]; then
+               maint=${kmaint}
+            else
+               maint=${kdmaint}
+            fi
         fi
         if grep -q "^$line$" "$CACHEDIR/$1.desktop.pkgs"; then
             seeds="${seeds}${seeds:+, }Ubuntu"
-            maint=${umaint}
+            if [ ! -n "$showdate" ]; then
+               maint=${umaint}
+            else
+               maint=${udmaint}
+            fi
         fi
         if grep -q "^$line$" "$CACHEDIR/$1.server.pkgs"; then
             seeds="${seeds}${seeds:+, }Server"
-            maint=${smaint}
+            if [ ! -n "$showdate" ]; then
+               maint=${smaint}
+            else
+               maint=${sdmaint}
+            fi
         fi
         case "$filter" in
             n|N)
@@ -271,6 +307,67 @@
     done
 }
 
+
+get_date() {
+   # release version
+   rvers="$1"
+   # support time
+   stime="$2"
+
+   # standard release date
+   rdate="$(date_from_vers ${rvers})-01";
+   
+   # standard support time
+   stime=${stime/y/year}
+   stime=${stime/mo/month}
+
+   # support date
+   sdate=$(date -d"${rdate} + ${stime}" +"%Y-%m")
+
+   echo ${sdate}
+}
+
+
+date_from_vers() {
+   rvers="$1";
+
+   vers_maj=${rvers%%\.*};
+   vers_min=${rvers##*\.};
+
+   if [ $vers_maj -lt 10 ]; then
+      rdate="200${vers_maj}-${vers_min}";
+   else
+      rdate="20${vers_maj}-${vers_min}";
+   fi
+
+   echo ${rdate};
+}
+
+
+release_lts() {
+   rvers="$1";
+   rname="$2";
+
+   umaint="3y";kmaint="18mo";smaint="5y";
+   udmaint=$(get_date ${rvers} ${umaint});
+   kdmaint=$(get_date ${rvers} ${kmaint});
+   sdmaint=$(get_date ${rvers} ${smaint});
+   echo "${rvers}(${rname})-Maint.til:Ubuntu->${udmaint},Server->${sdmaint},Kubuntu->${kdmaint}"
+}
+
+
+release_normal() {
+   rvers="$1";
+   rname="$2";
+
+   umaint="18mo";kmaint="18mo";smaint="18mo";
+   udmaint=$(get_date ${rvers} ${umaint});
+   kdmaint=$(get_date ${rvers} ${kmaint});
+   sdmaint=$(get_date ${rvers} ${smaint});
+   echo "${rvers}(${rname})-Maint.til: All->${udmaint}"
+}
+
+
 set_release_variables() {
         release="$1"
         amaint="18mo" #minimum maintenance for any package in supported
@@ -278,39 +375,39 @@
 
         case "$release" in
         dapper) #no structure file
+            rdate="2006-06";
             umaint="3y";kmaint="3y";smaint="5y";
-            echo "6.06(dapper drake)-Maint.til:Ubuntu->2009-06,Server->2011-06,Kubuntu->2009-06"
+            udmaint=$(get_date ${rdate} ${umaint});
+            kdmaint=$(get_date ${rdate} ${kmaint});
+            sdmaint=$(get_date ${rdate} ${smaint});
+            echo "6.06(dapper drake)-Maint.til:Ubuntu->${udmaint},Server->${sdmaint},Kubuntu->${kdmaint}"
         ;;
         edgy) #no structure file
-            umaint="18mo";kmaint="18mo";smaint="18mo";
-            echo "6.10(Edgy Eft)-Maint.til: All->2008-04"
+            release_normal "6.10" "Edgy Eft";
         ;;
         feisty)  #general case, we have a structure file
-            umaint="18mo";kmaint="18mo";smaint="18mo";
-            echo "7.04(feisty fawn)-Maint.til: All->2008-10"
+            release_normal "7.04" "Feisty Fawn";
         ;;
         gutsy) #structure file is invalid
-            umaint="18mo";kmaint="18mo";smaint="18mo";
-            echo "7.10(gusty gibbon)-Maint.til: All->2009-04"
+            release_normal "7.10" "Gutsy Gibbon";
         ;;
         *) #general case, we have a structure file
-            umaint="18mo";kmaint="18mo";smaint="18mo";
             case "$release" in
             hardy)
-                echo "8.04(hardy heron)-Maint.til:Ubuntu->2011-04,Server->2013-04,Kubuntu->2009-10"
-                umaint="3y";kmaint="18mo";smaint="5y";
+                release_lts "8.04" "Hardy Heron";
                 ;;
             intrepid)
-                echo "8.10(intrepid ibex)-Maint.til: All->2010-04"
+                release_normal "8.10" "Intrepid Ibex";
                 ;;
             jaunty)
-                echo "9.04(jaunty jackalope)-Maint.til: All->2010-10"
+                release_normal "9.04" "Jaunty Jackalope";
                 ;;
             karmic)
-                echo "9.10(karmic koala)-Maint.til: All->2011-04"
+                release_normal "9.10" "Karmic Koala";
                 ;;
             *)
                 umaint="X";kmaint="X";smaint="X";
+                udmaint="X";kdmaint="X";sdmaint="X";
                 echo "unknown release"
                 ;;
             esac
@@ -331,56 +428,56 @@
 
         case "$release" in
         dapper) #no structure file
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/ubuntu"
+            source="${usource}/ubuntu"
             getlistsold "$release" "$source" "server-ship" "server"\
                 "boot server standard installer minimal ship supported-sysadmin-common supported-libraries-common supported-installer-common supported-base supported-development supported-kernel supported-misc-server supported-network-common supported-hardware-common supported-server"
             getlistsold "$release" "$source" "ship" "desktop" \
                 "boot desktop live installer standard ship-live minimal ship supported-sysadmin-common supported-libraries-common supported-installer-common supported-base supported-development supported-kernel supported-misc-server supported-network-common supported-hardware-common supported-sysadmin-desktop supported-installer-desktop supported-network-desktop supported-hardware-desktop supported-desktop-common"
             getlists "$release" "$source" "supported" "supported"
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/kubuntu"
+            source="${usource}/kubuntu"
             getlistsold "$release" "$source" "ship" "kubuntu" \
                 "boot desktop live installer standard ship-live minimal ship supported-sysadmin-common supported-libraries-common supported-installer-common supported-base supported-development supported-kernel supported-misc-server supported-network-common supported-hardware-common supported-sysadmin-desktop supported-installer-desktop supported-network-desktop supported-hardware-desktop supported-desktop-common"
             parseinstalled $release "$@" > $release.installed
         ;;
         edgy) #no structure file
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/ubuntu"
+            source="${usource}/ubuntu"
             getlistsold "$release" "$source" "server-ship" "server" \
                 "boot server standard installer minimal ship supported"
             getlistsold "$release" "$source" "ship" "desktop" \
                 "boot desktop live installer standard ship-live minimal ship supported"
             getlists "$release" "$source" "supported" "supported"
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/kubuntu"
+            source="${usource}/kubuntu"
             getlistsold "$release" "$source" "ship" "kubuntu" \
                 "boot desktop live installer standard ship-live minimal ship supported"
         ;;
         feisty)  #general case, we have a structure file
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/ubuntu"
+            source="${usource}/ubuntu"
             getlists "$release" "$source" "server-ship" "server" \
             "boot desktop live installer standard ship-live minimal ship supported"
             getlists "$release" "$source" "ship" "desktop"\
             "boot desktop live installer standard ship-live minimal ship supported"
             getlists "$release" "$source" "supported" "supported"
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/kubuntu"
+            source="${usource}/kubuntu"
             getlists "$release" "$source" "ship" "kubuntu"\
             "boot desktop live installer standard ship-live minimal ship supported"
         ;;
         gutsy) #structure file is invalid
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/ubuntu"
+            source="${usource}/ubuntu"
             getlistsold "$release" "$source" "server-ship" "server" \
                 "boot required minimal standard dns-server lamp-server openssh-server print-server samba-server postgresql-server mail-server ship supported"
             getlistsold "$release" "$source" "ship" "desktop" \
                 "boot required minimal standard desktop ship supported"
             getlists "$release" "$source" "supported" "supported"
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/kubuntu"
+            source="${usource}/kubuntu"
             getlistsold "$release" "$source" "ship" "kubuntu" \
                 "boot required minimal standard desktop ship supported"
         ;;
         *) #general case, we have a structure file
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/ubuntu"
+            source="${usource}/ubuntu"
             getlists "$release" "$source" "server-ship supported-server" "server"
             getlists "$release" "$source" "ship supported-desktop" "desktop"
             getlists "$release" "$source" "supported" "supported"
-            source="http://people.ubuntu.com/~ubuntu-archive/germinate-output/kubuntu"
+            source="${usource}/kubuntu"
             getlists "$release" "$source" "ship supported-desktop" "kubuntu"
         ;;
         esac