~elementary-os/ubuntu-package-imports/update-manager-precise

« back to all changes in this revision

Viewing changes to ubuntu-support-status

  • Committer: Cody Garver
  • Date: 2016-10-29 19:54:23 UTC
  • Revision ID: cody@elementary.io-20161029195423-81t27r0nu22eqcb0
updated to version 1:0.156.14.20

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
    (support_end_year, support_end_month) = get_maintenance_end_date(release_date, supported_for_n_month)
49
49
    support_end_month_str = locale.nl_langinfo(getattr(locale,"MON_%d" % support_end_month))
50
50
    # check if the support has ended
51
 
    support_ended = (now.year >= support_end_year and 
52
 
                     now.month > support_end_month)
 
51
    support_ended = (now.year > support_end_year or
 
52
                     (now.year == support_end_year and now.month > support_end_month))
53
53
 
54
54
    # build dict for the argument string
55
55
    d = { 'support_tag' : supported_tag,
57
57
          'support_end_year' : support_end_year }
58
58
 
59
59
    if support_ended:
60
 
        (False, "%(support_end_month_str)s %(support_end_year)s (%(support_tag)s)" % d)
 
60
        return (False, "%(support_end_month_str)s %(support_end_year)s (%(support_tag)s)" % d)
61
61
    return (True, "%(support_end_month_str)s %(support_end_year)s (%(support_tag)s)" % d)
62
62
            
63
63
if __name__ == "__main__":