[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/sysadmin/libqapt/src
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2011-01-12 20:26:44
Message-ID: 20110112202644.50856AC8B3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214070 by jmthomas:

The Supported package tag can also report years, not just months, so support this as well.

 M  +10 -3     package.cpp  


--- trunk/extragear/sysadmin/libqapt/src/package.cpp #1214069:1214070
@@ -489,11 +489,18 @@
     }
 
     QString supportTimeString = controlField(QLatin1String("Supported"));
-    supportTimeString.chop(1); // Remove the letter signifying months
-    const int supportTime = supportTimeString.toInt(); // months
+    QChar unit = supportTimeString.at(supportTimeString.length() - 1);
+    supportTimeString.chop(1); // Remove the letter signifying months/years
+    const int supportTime = supportTimeString.toInt();
 
-    QDateTime supportEnd = QDateTime::fromTime_t(releaseDate).addMonths(supportTime);
+    QDateTime supportEnd;
 
+    if (unit == 'm') {
+        supportEnd = QDateTime::fromTime_t(releaseDate).addMonths(supportTime);
+    } else if (unit == 'y') {
+        supportEnd = QDateTime::fromTime_t(releaseDate).addYears(supportTime);
+    }
+
     return supportEnd.toString(QLatin1String("MMMM yyyy"));
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]