Request 1623 (accepted)

Overview

Request 1623 (accepted)

Check in 3.1.2

Created by vanmeeuwen over 8 years ago
In state accepted

Submit kolab-utils

Submit package Kolab:Winterfell / kolab-utils to package Kolab:16 / kolab-utils

kolab-utils.spec Changed

0002-no-tests-for-fbdaemon-on-Debian.patch Deleted

0002-no-tests-for-fbdaemon.patch Added

debian.changelog Changed

debian.series Changed

kolab-utils-3.1.1.tar.gz/CMakeLists.txt -> kolab-utils-3.1.2.tar.gz/CMakeLists.txt Changed

kolab-utils-3.1.1.tar.gz/upgradetool/upgradetool.cpp -> kolab-utils-3.1.2.tar.gz/upgradetool/upgradetool.cpp Changed

@@ -25,6 +25,7 @@
 #include "upgradeutilities.h"
 #include "imapupgradejob.h"
 #include "kolabutils-version.h"
+#include <ksystemtimezone.h>
 
 /**
  * Usage:
@@ -57,6 +58,8 @@
     options.add("a").add("auth <mode>", ki18n("Authentication mode to be used (PLAIN, LOGIN, CRAMMD5, DIGESTMD5, NTLM, GSSAPI, ANONYMOUS, CLEARTEXT)"), "PLAIN");
     options.add("fix-utc-incidences", ki18n("Converts all incidences from UTC to floating time."));
 //     options.add("f").add
+    options.add("fix-utc-incidences-offset <offset>", ki18n("Uses a UTC offset to convert the times. If not provided the local timezone get's used instead. The offset is in seconds."), "0");
+    options.add("fix-utc-incidences-timezone <timezone>", ki18n("Uses the specified timezone to convert the times. If not provided the local timezone get's used instead. Timezones are read from zone.tab"));
     options.add("+[server/file]", ki18n("IMAP Server/File"));
     KCmdLineArgs::addCmdLineOptions( options );
     QCoreApplication app(argc, argv);
@@ -80,9 +83,16 @@
         }
     }
 
-    const bool fixUtcIncidences = args->isSet("fix-utc-incidences");
+    const bool fixUtcIncidencesWithOffset = args->isSet("fix-utc-incidences-offset");
+    const bool fixUtcIncidencesWithTimezone = args->isSet("fix-utc-incidences-timezone");
+    const bool fixUtcIncidences = args->isSet("fix-utc-incidences") || fixUtcIncidencesWithOffset || fixUtcIncidencesWithTimezone;
     Kolab::Upgrade::UpgradeOptions upgradeOptions;
     upgradeOptions.fixUtcIncidences = fixUtcIncidences;
+    upgradeOptions.fixUtcIncidencesWithOffset = fixUtcIncidencesWithOffset;
+    upgradeOptions.fixUtcIncidencesOffset = args->getOption("fix-utc-incidences-offset").toInt();
+    if (fixUtcIncidencesWithTimezone) {
+        upgradeOptions.fixUtcIncidencesTimezone = KSystemTimeZones::readZone(args->getOption("fix-utc-incidences-timezone"));
+    }
     upgradeOptions.overrideObjectType = overrideType;

kolab-utils-3.1.1.tar.gz/upgradetool/upgradeutilities.cpp -> kolab-utils-3.1.2.tar.gz/upgradetool/upgradeutilities.cpp Changed

@@ -24,8 +24,9 @@
 #include <kolabevent.h>
 #include <kolabformat.h>
 #include <errorhandler.h>
-#include <KCalCore/Event>
-#include <KDateTime>
+#include <kcalcore/event.h>
+#include <kdatetime.h>
+#include <ksystemtimezone.h>
 
 namespace Kolab {
     namespace Upgrade {
@@ -34,7 +35,13 @@
 {
     if (upgradeOptions.fixUtcIncidences) {
         if (incidence->dtStart().isUtc()) {
-            incidence->shiftTimes(KDateTime::Spec::LocalZone(), KDateTime::Spec::ClockTime());
+            if (upgradeOptions.fixUtcIncidencesTimezone.isValid()) {
+                incidence->shiftTimes(upgradeOptions.fixUtcIncidencesTimezone, KDateTime::Spec::ClockTime());
+            } else if (upgradeOptions.fixUtcIncidencesWithOffset) {
+                incidence->shiftTimes(KDateTime::Spec::OffsetFromUTC(upgradeOptions.fixUtcIncidencesOffset), KDateTime::Spec::ClockTime());
+            } else {
+                incidence->shiftTimes(KDateTime::Spec::LocalZone(), KDateTime::Spec::ClockTime());
+            }
         }
     }
 }

kolab-utils-3.1.1.tar.gz/upgradetool/upgradeutilities.h -> kolab-utils-3.1.2.tar.gz/upgradetool/upgradeutilities.h Changed

kolab-utils.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 1623 0

Request History

vanmeeuwen created request over 8 years ago

Check in 3.1.2

vanmeeuwen accepted review over 8 years ago

vanmeeuwen approved review over 8 years ago

vanmeeuwen accepted request over 8 years ago