diff -Nru update-manager-0.156.14.19/debian/changelog update-manager-0.156.14.20/debian/changelog --- update-manager-0.156.14.19/debian/changelog 2015-04-07 14:00:23.000000000 +0000 +++ update-manager-0.156.14.20/debian/changelog 2016-09-30 16:58:09.000000000 +0000 @@ -1,3 +1,10 @@ +update-manager (1:0.156.14.20) precise-proposed; urgency=medium + + * Correctly calculate the end of support, and return correctly when support + has ended. Patch from Andrew Gaul, with thanks. (LP: #1574193) + + -- Brian Murray Fri, 30 Sep 2016 09:55:44 -0700 + update-manager (1:0.156.14.19) precise-proposed; urgency=low * fix crash in release upgrader when no official mirror is diff -Nru update-manager-0.156.14.19/ubuntu-support-status update-manager-0.156.14.20/ubuntu-support-status --- update-manager-0.156.14.19/ubuntu-support-status 2014-08-20 07:49:16.000000000 +0000 +++ update-manager-0.156.14.20/ubuntu-support-status 2016-09-30 16:58:16.000000000 +0000 @@ -48,8 +48,8 @@ (support_end_year, support_end_month) = get_maintenance_end_date(release_date, supported_for_n_month) support_end_month_str = locale.nl_langinfo(getattr(locale,"MON_%d" % support_end_month)) # check if the support has ended - support_ended = (now.year >= support_end_year and - now.month > support_end_month) + support_ended = (now.year > support_end_year or + (now.year == support_end_year and now.month > support_end_month)) # build dict for the argument string d = { 'support_tag' : supported_tag, @@ -57,7 +57,7 @@ 'support_end_year' : support_end_year } if support_ended: - (False, "%(support_end_month_str)s %(support_end_year)s (%(support_tag)s)" % d) + return (False, "%(support_end_month_str)s %(support_end_year)s (%(support_tag)s)" % d) return (True, "%(support_end_month_str)s %(support_end_year)s (%(support_tag)s)" % d) if __name__ == "__main__":