Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package snapper for openSUSE:Factory checked
in at 2021-02-04 20:22:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/snapper (Old)
and /work/SRC/openSUSE:Factory/.snapper.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper"
Thu Feb 4 20:22:26 2021 rev:122 rq:868342 version:0.8.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2020-12-22
11:28:04.840856850 +0100
+++ /work/SRC/openSUSE:Factory/.snapper.new.28504/snapper.changes
2021-02-04 20:22:43.694703308 +0100
@@ -1,0 +2,5 @@
+Mon Jan 25 11:29:45 CET 2021 - aschn...@suse.com
+
+- fixed testsuite for equal-date (gh#openSUSE/snapper#526)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snapper.spec ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:44.398704380 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:44.398704380 +0100
@@ -1,7 +1,7 @@
#
# spec file for package snapper
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ debian.tar.gz ++++++
++++++ snapper-0.8.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/configure new/snapper-0.8.15/configure
--- old/snapper-0.8.15/configure 2020-12-21 01:00:00.000000000 +0100
+++ new/snapper-0.8.15/configure 2021-01-25 01:00:00.000000000 +0100
@@ -17254,7 +17254,6 @@
$as_echo "yes" >&6; }
fi
-if test "x$with_zypp" = "xyes"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSONC" >&5
@@ -17328,7 +17327,6 @@
$as_echo "yes" >&6; }
fi
-fi
ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h"
"ac_cv_header_acl_libacl_h" "$ac_includes_default"
if test "x$ac_cv_header_acl_libacl_h" = xyes; then :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/configure.ac
new/snapper-0.8.15/configure.ac
--- old/snapper-0.8.15/configure.ac 2020-12-21 01:00:00.000000000 +0100
+++ new/snapper-0.8.15/configure.ac 2021-01-25 01:00:00.000000000 +0100
@@ -194,9 +194,7 @@
PKG_CHECK_MODULES(DBUS, dbus-1)
PKG_CHECK_MODULES(XML2, libxml-2.0)
-if test "x$with_zypp" = "xyes"; then
- PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c.
Please install libjson-c-devel])])
-fi
+PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please
install libjson-c-devel])])
AC_CHECK_HEADER(acl/libacl.h,[],[AC_MSG_ERROR([Cannout find libacl headers.
Please install libacl-devel])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/po/fi.po new/snapper-0.8.15/po/fi.po
--- old/snapper-0.8.15/po/fi.po 2020-12-21 01:00:00.000000000 +0100
+++ new/snapper-0.8.15/po/fi.po 2021-01-25 01:00:00.000000000 +0100
@@ -6,9 +6,10 @@
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-12-17 13:34+0100\n"
-"PO-Revision-Date: 2020-08-24 00:40+0000\n"
+"PO-Revision-Date: 2020-12-28 19:37+0000\n"
"Last-Translator: Tommi Nieminen <softw...@legisign.org>\n"
-"Language-Team: Finnish
<https://l10n.opensuse.org/projects/snapper/master/fi/>\n"
+"Language-Team: Finnish <https://l10n.opensuse.org/projects/snapper/master/fi/";
+">\n"
"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +18,13 @@
"X-Generator: Weblate 3.6.1\n"
msgid "\t--abbreviate\t\t\tAllow to abbreviate table columns."
-msgstr ""
+msgstr "\t--abbreviate\t\t\tSalli lyhent???? taulukon sarakkeita."
msgid "\t--all-configs, -a\t\tList snapshots from all accessible configs."
msgstr "\t--all-configs, -a\t\tLuettele tilannekuvia kaikista k??ytett??viss??
olevista kokoonpanoista."
msgid "\t--ambit, -a ambit\t\tOperate in the specified ambit."
-msgstr ""
+msgstr "\t--ambit, -a ambit\t\tToimi ilmoitetulla tilalla."
msgid "\t--cleanup-algorithm, -c <algo>\tCleanup algorithm for snapshot."
msgstr "\t--cleanup-algorithm, -c <algo>\tTilannevedoksen puhdistusalgoritmi."
@@ -37,12 +38,19 @@
"\t\t\t\t\ttype, date, user, used-space, cleanup, description, userdata,\n"
"\t\t\t\t\tpre-number, post-number, post-date."
msgstr ""
+"\t--columns <sarakkeet>\t\tN??ytett??v??t sarakkeet pilkuin erotettuna.\n"
+"\t\t\t\t\tMahdolliset sarakkeet: config, subvolume, number, default,\n"
+"\t\t\t\t\tactive, type, date, user, used-space, cleanup, description,\n"
+"\t\t\t\t\tuserdata, pre-number, post-number, post-date."
msgid ""
"\t--columns <columns>\t\tColumns to show separated by comma.\n"
"\t\t\t\t\tPossible columns: key, value.\n"
"\t\t\t\t\tColumns are not selected when JSON format is used."
msgstr ""
+"\t--columns <sarakkeet>\t\tN??ytett??v??t sarakkeet pilkuin erotettuna.\n"
+"\t\t\t\t\tMahdolliset sarakkeet: key, value.\n"
+"\t\t\t\t\tSarakkeita ei valita JSON-muotoa k??ytett??ess??."
msgid "\t--command <command>\t\tRun command and create pre and post snapshots."
msgstr "\t--command <komento>\t\tSuorita komento ja luo ennen- ja
j??lkeen-tilannevedokset."
@@ -69,7 +77,7 @@
msgstr "\t--extensions, -x <valinnat>\tdiff-komennolle v??litett??v??t
lis??valinnat."
msgid "\t--free-space <space>\t\tTry to make space available."
-msgstr ""
+msgstr "\t--free-space <tila>\t\tYrit?? vapauttaa tilaa."
msgid "\t--from\t\t\t\tCreate a snapshot from the specified snapshot."
msgstr "\t--from\t\t\t\tLuo tilannekuva m????ritetyst?? tilannekuvasta."
@@ -100,6 +108,7 @@
msgid "\t--path <path>\t\t\tCleanup all configs affecting path."
msgstr ""
+"\t--path <sijainti>\t\t\tSiivoa kaikki sijaintiin vaikuttavat m????ritykset."
msgid "\t--pre-number <number>\t\tNumber of corresponding pre snapshot."
msgstr "\t--pre-number <numero>\t\tVastaavan ennen-tilannevedoksen numero."
@@ -212,9 +221,8 @@
msgid " Global options:"
msgstr " Yleisvalitsimet:"
-#, fuzzy
msgid " Options for 'cleanup' command:"
-msgstr " ???create???-komennon valitsimet:"
+msgstr " Vaihtoehdot \"cleanup\" komennolle:"
msgid " Options for 'create' command:"
msgstr " ???create???-komennon valitsimet:"
@@ -228,9 +236,8 @@
msgid " Options for 'diff' command:"
msgstr " ???diff???-komennon valitsimet:"
-#, fuzzy
msgid " Options for 'get-config' command:"
-msgstr " ???create-config???-komennon valitsimet:"
+msgstr " Vaihtoehdot \"get-config\" komennolle:"
msgid " Options for 'list' command:"
msgstr " ???list???-komennon valitsimet:"
@@ -240,6 +247,9 @@
"\t--columns <columns>\t\tColumns to show separated by comma.\n"
"\t\t\t\t\tPossible columns: config, subvolume.\n"
msgstr ""
+" Valitsimet komennolle ???list-configs???:\n"
+"\t--columns <sarakkeet>\t\tN??ytett??v??t sarakkeet pilkuin erotettuna.\n"
+"\t\t\t\t\tMahdolliset sarakkeet: config, subvolume.\n"
msgid " Options for 'modify' command:"
msgstr " ???modify???-komennon valitsimet:"
@@ -312,14 +322,14 @@
#. %2$s is replaced by second value
#, c-format
msgid "%1$s or %2$s"
-msgstr ""
+msgstr "%1$s tai %2$s"
#. TRANSLATORS: used to construct list of values
#. %1$s is replaced by first value
#. %2$s is replaced by second value
#, c-format
msgid "%1$s, %2$s"
-msgstr ""
+msgstr "%1$s, %2$s"
#, c-format
msgid "(Snapshot %d.)"
@@ -330,7 +340,7 @@
msgstr "ACL-virhe."
msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
msgid "Active snapshot is already default snapshot."
msgstr "Aktiivinen tilannekuva on jo oletus."
@@ -458,10 +468,10 @@
#, c-format
msgid "Could not make enough free space available for path '%s'."
-msgstr ""
+msgstr "Ei voitu vapauttaa tarpeeksi tilaa sijainnille ???%s???."
msgid "Could not make enough free space available."
-msgstr ""
+msgstr "Ei voitu vapauttaa tarpeeksi tilaa."
#, c-format
msgid "Creating config failed (%s)."
@@ -487,7 +497,7 @@
msgstr "P??iv??ys"
msgid "Default"
-msgstr ""
+msgstr "Oletus"
#, c-format
msgid "Deleting config failed (%s)."
@@ -510,10 +520,9 @@
#. TRANSLATORS: symbol for "exa" (best keep untranslated)
msgid "E"
-msgstr ""
+msgstr "E"
#. TRANSLATORS: symbol for "exa bytes" (best keep untranslated)
-#, fuzzy
msgid "EB"
msgstr "EiB"
@@ -535,17 +544,16 @@
msgid "Failed to initialize filesystem handler."
msgstr "Tiedostoj??rjestelm??k??sittelyn alustus ep??onnistui."
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse '%s'."
-msgstr "%s luominen ep??onnistui"
+msgstr "\"%s\" luominen ep??onnistui."
#, c-format
msgid "Failed to query free space for path '%s'."
-msgstr ""
+msgstr "Vapaan tilan kysely sijainnista ???%s??? ep??onnistui."
-#, fuzzy
msgid "Failed to query free space."
-msgstr "%s luominen ep??onnistui"
+msgstr "Vapaan tilan kysely ep??onnistui."
msgid "Failed to set locale. Fix your system."
msgstr "Maa-asetuksen asettaminen ep??onnistui. Korjaa j??rjestelm??."
@@ -568,12 +576,11 @@
#. TRANSLATORS: symbol for "giga" (best keep untranslated)
msgid "G"
-msgstr ""
+msgstr "G"
#. TRANSLATORS: symbol for "giga bytes" (best keep untranslated)
-#, fuzzy
msgid "GB"
-msgstr "GiB"
+msgstr "Gt"
#. TRANSLATORS: symbol for "gibi bytes" (best keep untranslated)
msgid "GiB"
@@ -595,31 +602,30 @@
msgid "Illegal snapshot."
msgstr "Virheellinen tilannevedos."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid ambit '%s'."
-msgstr "Virheellinen tilannevedos \"%s\"."
+msgstr "Virheellinen alue \"%s\"."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid column '%s'."
-msgstr "Virheellinen tilannevedos \"%s\"."
+msgstr "Virheellinen sarake \"%s\"."
msgid "Invalid configdata."
msgstr "Virheellinen m????ritystieto."
-#, fuzzy
msgid "Invalid free-space value."
-msgstr "Virheellinen alitaltio."
+msgstr "Virheellinen vapaan tilan arvo."
msgid "Invalid group."
msgstr "Virheellinen ryhm??."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid machine readable format '%s'."
-msgstr "Virheellinen koneluettava muoto %s."
+msgstr "Virheellinen tietokoneen formaatti \"%s\"."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid path '%s'."
-msgstr "Virheellinen tilannevedos \"%s\"."
+msgstr "Virheellinen polku \"%s\"."
#, c-format
msgid "Invalid snapshot '%s'."
@@ -631,9 +637,9 @@
msgid "Invalid subvolume."
msgstr "Virheellinen alitaltio."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid table style '%s'."
-msgstr "Virheellinen taulukkotyyli %s."
+msgstr "Virheellinen taulukkotyyli \"%s\"."
msgid "Invalid user."
msgstr "Virheellinen k??ytt??j??."
@@ -654,12 +660,11 @@
#. TRANSLATORS: symbol for "mega" (best keep untranslated)
msgid "M"
-msgstr ""
+msgstr "M"
#. TRANSLATORS: symbol for "mega bytes" (best keep untranslated)
-#, fuzzy
msgid "MB"
-msgstr "MiB"
+msgstr "Mt"
msgid "Maybe you forgot the delimiter '..' between the snapshot numbers."
msgstr "Unohdit ehk?? tilannevedosnumeroiden v??list?? erottimen ???..???."
@@ -676,7 +681,6 @@
msgid "Missing argument for global option '%s'."
msgstr "Yleisvalitsimelta ???%s??? puuttuu parametri."
-#, fuzzy
msgid "Missing command option."
msgstr "Komennolta puuttuu parametri."
@@ -704,12 +708,11 @@
#. TRANSLATORS: symbol for "peta" (best keep untranslated)
msgid "P"
-msgstr ""
+msgstr "P"
#. TRANSLATORS: symbol for "peta bytes" (best keep untranslated)
-#, fuzzy
msgid "PB"
-msgstr "PiB"
+msgstr "Pt"
#. TRANSLATORS: symbol for "pebi bytes" (best keep untranslated)
msgid "PiB"
@@ -751,12 +754,11 @@
#. TRANSLATORS: symbol for "tera" (best keep untranslated)
msgid "T"
-msgstr ""
+msgstr "T"
#. TRANSLATORS: symbol for "tera bytes" (best keep untranslated)
-#, fuzzy
msgid "TB"
-msgstr "TiB"
+msgstr "Tt"
msgid "The ambit can be specified manually using the --ambit option."
msgstr ""
@@ -796,15 +798,15 @@
msgid "Unknown option '%s' for command '%s'."
msgstr "Tuntematon valitsin \"%s\" komennolle \"%s\"."
-#, fuzzy, c-format
+#, c-format
msgid "Unknown type '%s'."
-msgstr "Tuntematon komento \"%s\"."
+msgstr "Tuntematon tyyppi \"%s\"."
#. TRANSLATORS: a list of possible values
#. %1$s is replaced by list of possible values
#, c-format
msgid "Use %1$s."
-msgstr ""
+msgstr "K??yt??: %1$s."
#, c-format
msgid "Use an integer number from %d to %d."
@@ -856,34 +858,31 @@
#. TRANSLATORS: symbol for "kilo" (best keep untranslated)
msgid "k"
-msgstr ""
+msgstr "k"
#. TRANSLATORS: symbol for "kilo bytes" (best keep untranslated)
-#, fuzzy
msgid "kB"
-msgstr "B"
+msgstr "kt"
#, c-format
msgid "modifying %s"
msgstr "muokataan: %s"
msgid "no"
-msgstr ""
+msgstr "ei"
msgid "nothing to do"
msgstr "ei mit????n teht??v????"
-#, fuzzy
msgid "root argument can be used only together with no-dbus.\n"
msgstr ""
-"juuriparametria voi k??ytt???? vain ilman no-dbus-valitsinta.\n"
-"Lis??ohjeita komennolla ???snapper --help???."
+"root parametria voidaan k??ytt???? vain yhdess?? no-dbus-valitsimen kanssa.\n"
msgid "usage: snapper [--global-options] <command> [--command-options]
[command-arguments]"
msgstr "k??ytt??: snapper [--yleisvalitsimet] <komento>
[--komennon-valitsimet] [komennon-parametrit]"
msgid "yes"
-msgstr ""
+msgstr "kyll??"
#~ msgid "Unknown type of snapshot."
#~ msgstr "Tuntematon tilannevedostyyppi."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/po/it.po new/snapper-0.8.15/po/it.po
--- old/snapper-0.8.15/po/it.po 2020-12-21 01:00:00.000000000 +0100
+++ new/snapper-0.8.15/po/it.po 2021-01-25 01:00:00.000000000 +0100
@@ -4,9 +4,10 @@
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-12-17 13:34+0100\n"
-"PO-Revision-Date: 2020-10-01 09:48+0000\n"
+"PO-Revision-Date: 2020-12-25 17:27+0000\n"
"Last-Translator: Paolo Za <zapa...@email.it>\n"
-"Language-Team: Italian
<https://l10n.opensuse.org/projects/snapper/master/it/>\n"
+"Language-Team: Italian <https://l10n.opensuse.org/projects/snapper/master/it/";
+">\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -15,7 +16,7 @@
"X-Generator: Weblate 3.6.1\n"
msgid "\t--abbreviate\t\t\tAllow to abbreviate table columns."
-msgstr ""
+msgstr "\t--abbreviate\t\t\tConsente di abbreviare le colonne della tabella."
msgid "\t--all-configs, -a\t\tList snapshots from all accessible configs."
msgstr "\t--all-configs, -a\t\tElenca gli shapshot da tutte le configurazioni
accessibili."
@@ -594,7 +595,7 @@
msgid "Illegal snapshot."
msgstr "Istantanea illegale."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid ambit '%s'."
msgstr "Ambito '%s' non valido."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/po/ru.po new/snapper-0.8.15/po/ru.po
--- old/snapper-0.8.15/po/ru.po 2020-12-21 01:00:00.000000000 +0100
+++ new/snapper-0.8.15/po/ru.po 2021-01-25 01:00:00.000000000 +0100
@@ -4,18 +4,20 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-12-17 13:34+0100\n"
-"PO-Revision-Date: 2020-06-29 19:46+0000\n"
+"PO-Revision-Date: 2021-01-04 17:38+0000\n"
"Last-Translator: Alex Minton <alex...@gmail.com>\n"
-"Language-Team: Russian
<https://l10n.opensuse.org/projects/snapper/master/ru/>\n"
+"Language-Team: Russian <https://l10n.opensuse.org/projects/snapper/master/ru/";
+">\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 3.6.1\n"
msgid "\t--abbreviate\t\t\tAllow to abbreviate table columns."
-msgstr ""
+msgstr "\t--abbreviate\t\t\t?????????????????? ???????????????????????? ??
???????????????? ??????????????."
msgid "\t--all-configs, -a\t\tList snapshots from all accessible configs."
msgstr "\t--all-configs, -a\t\t???????????? ????????????????????????
?????????????? ???? ???????? ?????????????????? ????????????????????????."
@@ -35,12 +37,19 @@
"\t\t\t\t\ttype, date, user, used-space, cleanup, description, userdata,\n"
"\t\t\t\t\tpre-number, post-number, post-date."
msgstr ""
+"\t--columns <??????????????>\t\t???????????????????????? ??????????????
?????????? ??????????????.\n"
+"\t\t\t\t\t?????????????????? ??????????????: config, subvolume, number,
default, active,\n"
+"\t\t\t\t\ttype, date, user, used-space, cleanup, description, userdata,\n"
+"\t\t\t\t\tpre-number, post-number, post-date."
msgid ""
"\t--columns <columns>\t\tColumns to show separated by comma.\n"
"\t\t\t\t\tPossible columns: key, value.\n"
"\t\t\t\t\tColumns are not selected when JSON format is used."
msgstr ""
+"\t--columns <??????????????>\t\t???????????????????????? ??????????????
?????????? ??????????????.\n"
+"\t\t\t\t\t?????????????????? ??????????????: key, value.\n"
+"\t\t\t\t\t?????? ?????????????????????????? ?????????????? JSON
?????????????? ???? ????????????????????."
msgid "\t--command <command>\t\tRun command and create pre and post snapshots."
msgstr "\t--command <??????????????>\t\t?????????????????? ?????????????? ??
?????????????? ??????- ?? ????????-????????????."
@@ -49,7 +58,7 @@
msgstr "\t--config, -c <??????>\t\t???????????????? ????????????????????????
????????????????????????."
msgid "\t--csvout\t\t\tSet CSV output format."
-msgstr ""
+msgstr "\t--csvout\t\t\t???????????? ???????????? ???????????? CSV."
msgid "\t--description, -d <description>\tDescription for snapshot."
msgstr "\t--description, -d <????????????????>\t???????????????? ????????????."
@@ -67,7 +76,7 @@
msgstr "\t--extensions, -x <options>\t????????????????????????????
??????????????????, ???????????????????? ?? ?????????????? diff."
msgid "\t--free-space <space>\t\tTry to make space available."
-msgstr ""
+msgstr "\t--free-space <??????????>\t\t????????????????????
???????????????????? ??????????."
msgid "\t--from\t\t\t\tCreate a snapshot from the specified snapshot."
msgstr "\t--from\t\t\t\t?????????????? ???????????? ???? ????????????????????
????????????."
@@ -85,10 +94,12 @@
msgstr "\t--iso\t\t\t\t???????????????????? ???????? ?? ?????????? ??
?????????????? ISO."
msgid "\t--jsonout\t\t\tSet JSON output format."
-msgstr ""
+msgstr "\t--jsonout\t\t\t???????????? ???????????? ???????????? JSON."
msgid "\t--machine-readable <format>\tSet a machine-readable output format
(csv, json)."
msgstr ""
+"\t--machine-readable <????????????>\t????????????
???????????????????????????? ???????????? ???????????? (csv, "
+"json)."
msgid "\t--no-dbus\t\t\tOperate without DBus."
msgstr "\t--no-dbus\t\t\t???????????????? ?????? DBus."
@@ -97,7 +108,7 @@
msgstr "\t--output, -o <????????>\t\t?????????????????? ???????????? ??
????????."
msgid "\t--path <path>\t\t\tCleanup all configs affecting path."
-msgstr ""
+msgstr "\t--path <????????>\t\t\t???????????????? ??????????????????,
???????????????? ???? ????????."
msgid "\t--pre-number <number>\t\tNumber of corresponding pre snapshot."
msgstr "\t--pre-number <??????????>\t\t??????????
???????????????????????????????? ???????????????????????????????? ????????????."
@@ -122,6 +133,7 @@
msgid "\t--separator <separator>\t\tCharacter separator for CSV output format."
msgstr ""
+"\t--separator <??????????????????????>\t\t????????????-??????????????????????
?????? ?????????????? ???????????? CSV."
msgid "\t--sync, -s\t\t\tSync after deletion."
msgstr "\t--sync, -s\t\t\t?????????????????????????? ??????????
????????????????."
@@ -210,9 +222,8 @@
msgid " Global options:"
msgstr " ?????????? ??????????????????:"
-#, fuzzy
msgid " Options for 'cleanup' command:"
-msgstr " ?????????? ?????????????? 'create':"
+msgstr " ?????????? ?????????????? 'cleanup':"
msgid " Options for 'create' command:"
msgstr " ?????????? ?????????????? 'create':"
@@ -226,9 +237,8 @@
msgid " Options for 'diff' command:"
msgstr " ?????????? ?????????????? 'diff':"
-#, fuzzy
msgid " Options for 'get-config' command:"
-msgstr " ?????????? ?????????????? 'create-config':"
+msgstr " ?????????? ?????????????? 'get-config':"
msgid " Options for 'list' command:"
msgstr " ?????????? ?????????????? 'list':"
@@ -238,6 +248,9 @@
"\t--columns <columns>\t\tColumns to show separated by comma.\n"
"\t\t\t\t\tPossible columns: config, subvolume.\n"
msgstr ""
+" ?????????? ?????????????? 'list-configs':\n"
+"\t--columns <??????????????>\t\t???????????????????????? ??????????????
?????????? ??????????????.\n"
+"\t\t\t\t\t?????????????????? ??????????????: config, subvolume.\n"
msgid " Options for 'modify' command:"
msgstr " ?????????? ?????????????? 'modify':"
@@ -310,14 +323,14 @@
#. %2$s is replaced by second value
#, c-format
msgid "%1$s or %2$s"
-msgstr ""
+msgstr "%1$s ?????? %2$s"
#. TRANSLATORS: used to construct list of values
#. %1$s is replaced by first value
#. %2$s is replaced by second value
#, c-format
msgid "%1$s, %2$s"
-msgstr ""
+msgstr "%1$s, %2$s"
#, c-format
msgid "(Snapshot %d.)"
@@ -328,10 +341,10 @@
msgstr "???????????? ACL."
msgid "Active"
-msgstr ""
+msgstr "??????????????"
msgid "Active snapshot is already default snapshot."
-msgstr ""
+msgstr "???????????????? ???????????? ?????? ???????????????? ??????????????
???? ??????????????????."
#, c-format
msgid "Ambit is %s."
@@ -357,7 +370,7 @@
msgstr ""
msgid "Cannot do rollback since default subvolume is unknown."
-msgstr ""
+msgstr "???????????????????? ?????????????????? ??????????, ???????????? ????
?????????????????? ????????????????????."
msgid "Cleanup"
msgstr "??????????????"
@@ -456,10 +469,10 @@
#, c-format
msgid "Could not make enough free space available for path '%s'."
-msgstr ""
+msgstr "???????????????????? ???????????????????? ????????????????????
?????????? ?????? ???????? ??%s??."
msgid "Could not make enough free space available."
-msgstr ""
+msgstr "???????????????????? ???????????????????? ????????????????????
??????????."
#, c-format
msgid "Creating config failed (%s)."
@@ -485,7 +498,7 @@
msgstr "????????"
msgid "Default"
-msgstr ""
+msgstr "???? ??????????????????"
#, c-format
msgid "Deleting config failed (%s)."
@@ -509,12 +522,11 @@
#. TRANSLATORS: symbol for "exa" (best keep untranslated)
msgid "E"
-msgstr ""
+msgstr "??"
#. TRANSLATORS: symbol for "exa bytes" (best keep untranslated)
-#, fuzzy
msgid "EB"
-msgstr "??????"
+msgstr "????"
#. TRANSLATORS: symbol for "exbi bytes" (best keep untranslated)
msgid "EiB"
@@ -533,17 +545,16 @@
msgid "Failed to initialize filesystem handler."
msgstr "???? ?????????????? ????????????????????????????????
???????????????????? ???????????????? ??????????????."
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse '%s'."
-msgstr "???????? ?????? ???????????????? %s"
+msgstr "???????? ?????? ?????????????? ??%s??."
#, c-format
msgid "Failed to query free space for path '%s'."
-msgstr ""
+msgstr "???????? ?????? ?????????????? ???????????????????? ?????????? ??????
???????? '%s'."
-#, fuzzy
msgid "Failed to query free space."
-msgstr "???????? ?????? ???????????????? %s"
+msgstr "???????? ?????? ?????????????? ???????????????????? ??????????."
msgid "Failed to set locale. Fix your system."
msgstr "???????? ?????????????????????? ????????????. ??????????????????
?????????????????? ??????????????????."
@@ -565,12 +576,11 @@
#. TRANSLATORS: symbol for "giga" (best keep untranslated)
msgid "G"
-msgstr ""
+msgstr "??"
#. TRANSLATORS: symbol for "giga bytes" (best keep untranslated)
-#, fuzzy
msgid "GB"
-msgstr "??????"
+msgstr "????"
#. TRANSLATORS: symbol for "gibi bytes" (best keep untranslated)
msgid "GiB"
@@ -594,27 +604,26 @@
msgid "Invalid ambit '%s'."
msgstr "???????????????? ???????????? '%s'."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid column '%s'."
-msgstr "???????????????? ???????????? '%s'."
+msgstr "???????????????? ?????????????? '%s'."
msgid "Invalid configdata."
msgstr "???????????????? ???????????? ????????????????????????."
-#, fuzzy
msgid "Invalid free-space value."
-msgstr "???????????????? ????????????."
+msgstr "???????????????? ???????????????? ??????????."
msgid "Invalid group."
msgstr "???????????????? ????????????."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid machine readable format '%s'."
-msgstr "???????????????? ?????????? ?????????????? %d."
+msgstr "???????????????? ???????????????????????????? ???????????? '%s'."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid path '%s'."
-msgstr "???????????????? ???????????? '%s'."
+msgstr "???????????????? ???????? '%s'."
#, c-format
msgid "Invalid snapshot '%s'."
@@ -626,9 +635,9 @@
msgid "Invalid subvolume."
msgstr "???????????????? ????????????."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid table style '%s'."
-msgstr "???????????????? ?????????? ?????????????? %d."
+msgstr "???????????????? ?????????? ?????????????? '%s'."
msgid "Invalid user."
msgstr "???????????????? ????????????????????????."
@@ -649,12 +658,11 @@
#. TRANSLATORS: symbol for "mega" (best keep untranslated)
msgid "M"
-msgstr ""
+msgstr "??"
#. TRANSLATORS: symbol for "mega bytes" (best keep untranslated)
-#, fuzzy
msgid "MB"
-msgstr "??????"
+msgstr "????"
msgid "Maybe you forgot the delimiter '..' between the snapshot numbers."
msgstr "????????????????, ???? ???????????? ?????????????????????? ..
?????????? ???????????????? ???????????????????????? ??????????????."
@@ -671,7 +679,6 @@
msgid "Missing argument for global option '%s'."
msgstr "?????????????????????? ???????????????? ?????? ?????????? '%s'."
-#, fuzzy
msgid "Missing command option."
msgstr "?????????????????????? ???????????????? ??????????????."
@@ -699,12 +706,11 @@
#. TRANSLATORS: symbol for "peta" (best keep untranslated)
msgid "P"
-msgstr ""
+msgstr "??"
#. TRANSLATORS: symbol for "peta bytes" (best keep untranslated)
-#, fuzzy
msgid "PB"
-msgstr "??????"
+msgstr "????"
#. TRANSLATORS: symbol for "pebi bytes" (best keep untranslated)
msgid "PiB"
@@ -745,12 +751,11 @@
#. TRANSLATORS: symbol for "tera" (best keep untranslated)
msgid "T"
-msgstr ""
+msgstr "??"
#. TRANSLATORS: symbol for "tera bytes" (best keep untranslated)
-#, fuzzy
msgid "TB"
-msgstr "??????"
+msgstr "????"
msgid "The ambit can be specified manually using the --ambit option."
msgstr ""
@@ -759,7 +764,7 @@
msgstr "???????????????????????? root ???? ????????????????????.
????????????????, snapper ???? ????????????????."
msgid "This can happen if the system was not set up for rollback."
-msgstr ""
+msgstr "?????? ?????????? ??????????????????, ???????? ?????????????? ????
?????????????????? ?????? ????????????."
#. TRANSLATORS: symbol for "tebi bytes" (best keep untranslated)
msgid "TiB"
@@ -790,15 +795,15 @@
msgid "Unknown option '%s' for command '%s'."
msgstr "?????????????????????? ?????????? '%s' ?????? ?????????????? '%s'."
-#, fuzzy, c-format
+#, c-format
msgid "Unknown type '%s'."
-msgstr "?????????????????????? ?????????????? '%s'."
+msgstr "?????????????????????? ?????? '%s'."
#. TRANSLATORS: a list of possible values
#. %1$s is replaced by list of possible values
#, c-format
msgid "Use %1$s."
-msgstr ""
+msgstr "?????????????????????? %1$s."
#, c-format
msgid "Use an integer number from %d to %d."
@@ -850,32 +855,30 @@
#. TRANSLATORS: symbol for "kilo" (best keep untranslated)
msgid "k"
-msgstr ""
+msgstr "??"
#. TRANSLATORS: symbol for "kilo bytes" (best keep untranslated)
-#, fuzzy
msgid "kB"
-msgstr "??"
+msgstr "????"
#, c-format
msgid "modifying %s"
msgstr "?????????????????? %s"
msgid "no"
-msgstr ""
+msgstr "??????"
msgid "nothing to do"
msgstr "???????????? ??????????????????"
-#, fuzzy
msgid "root argument can be used only together with no-dbus.\n"
-msgstr "???????????????? root ?????????? ???????????????????????? ????????????
???????????? ?? no-dbus."
+msgstr "???????????????? root ?????????? ???????????????????????? ????????????
???????????? ?? no-dbus.\n"
msgid "usage: snapper [--global-options] <command> [--command-options]
[command-arguments]"
msgstr "??????????????????????????: snapper [--??????????-??????????????????]
<??????????????> [--??????????-??????????????]
[??????????????????-??????????????]"
msgid "yes"
-msgstr ""
+msgstr "????"
#~ msgid "Unknown type of snapshot."
#~ msgstr "?????????????????????? ?????? ????????????."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/snapper/AppUtil.cc
new/snapper-0.8.15/snapper/AppUtil.cc
--- old/snapper-0.8.15/snapper/AppUtil.cc 2020-12-21 01:00:00.000000000
+0100
+++ new/snapper-0.8.15/snapper/AppUtil.cc 2021-01-25 01:00:00.000000000
+0100
@@ -147,10 +147,12 @@
string
prepend_root_prefix(const string& root_prefix, const string& path)
{
- if (root_prefix == "/")
- return path;
- else
- return root_prefix + path;
+ if (root_prefix == "/")
+ return path;
+ else if (path == "/")
+ return root_prefix;
+ else
+ return root_prefix + path;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/snapper/Lvm.cc
new/snapper-0.8.15/snapper/Lvm.cc
--- old/snapper-0.8.15/snapper/Lvm.cc 2020-12-21 01:00:00.000000000 +0100
+++ new/snapper-0.8.15/snapper/Lvm.cc 2021-01-25 01:00:00.000000000 +0100
@@ -89,7 +89,7 @@
bool found = false;
MtabData mtab_data;
- if (!getMtabData(subvolume, found, mtab_data))
+ if (!getMtabData(prepend_root_prefix(root_prefix, subvolume), found,
mtab_data))
throw InvalidConfigException();
if (!found)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/testsuite/Makefile.am
new/snapper-0.8.15/testsuite/Makefile.am
--- old/snapper-0.8.15/testsuite/Makefile.am 2020-12-21 01:00:00.000000000
+0100
+++ new/snapper-0.8.15/testsuite/Makefile.am 2021-01-25 01:00:00.000000000
+0100
@@ -9,7 +9,7 @@
check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test
\
equal-date.test dbus-escape.test cmp-lt.test humanstring.test
\
table.test table-formatter.test csv-formatter.test json-formatter.test
\
- getopts.test
+ getopts.test scan-datetime.test
if ENABLE_BTRFS_QUOTA
check_PROGRAMS += qgroup1.test
@@ -27,6 +27,8 @@
equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+scan_datetime_test_LDADD = -lboost_unit_test_framework
../client/utils/libutils.la
+
humanstring_test_LDADD = -lboost_unit_test_framework
../client/utils/libutils.la
table_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/testsuite/Makefile.in
new/snapper-0.8.15/testsuite/Makefile.in
--- old/snapper-0.8.15/testsuite/Makefile.in 2020-12-21 01:00:00.000000000
+0100
+++ new/snapper-0.8.15/testsuite/Makefile.in 2021-01-25 01:00:00.000000000
+0100
@@ -97,7 +97,7 @@
humanstring.test$(EXEEXT) table.test$(EXEEXT) \
table-formatter.test$(EXEEXT) csv-formatter.test$(EXEEXT) \
json-formatter.test$(EXEEXT) getopts.test$(EXEEXT) \
- $(am__EXEEXT_1) $(am__EXEEXT_2)
+ scan-datetime.test$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
@ENABLE_BTRFS_QUOTA_TRUE@am__append_1 = qgroup1.test
@ENABLE_LVM_TRUE@am__append_2 = lvm-utils.test
subdir = testsuite
@@ -160,6 +160,9 @@
qgroup1_test_LDADD = $(LDADD)
qgroup1_test_DEPENDENCIES = ../snapper/libsnapper.la \
../dbus/libdbus.la
+scan_datetime_test_SOURCES = scan-datetime.cc
+scan_datetime_test_OBJECTS = scan-datetime.$(OBJEXT)
+scan_datetime_test_DEPENDENCIES = ../client/utils/libutils.la
sysconfig_get1_test_SOURCES = sysconfig-get1.cc
sysconfig_get1_test_OBJECTS = sysconfig-get1.$(OBJEXT)
sysconfig_get1_test_LDADD = $(LDADD)
@@ -191,8 +194,9 @@
./$(DEPDIR)/dirname1.Po ./$(DEPDIR)/equal-date.Po \
./$(DEPDIR)/getopts.Po ./$(DEPDIR)/humanstring.Po \
./$(DEPDIR)/json-formatter.Po ./$(DEPDIR)/lvm-utils.Po \
- ./$(DEPDIR)/qgroup1.Po ./$(DEPDIR)/sysconfig-get1.Po \
- ./$(DEPDIR)/table-formatter.Po ./$(DEPDIR)/table.Po
+ ./$(DEPDIR)/qgroup1.Po ./$(DEPDIR)/scan-datetime.Po \
+ ./$(DEPDIR)/sysconfig-get1.Po ./$(DEPDIR)/table-formatter.Po \
+ ./$(DEPDIR)/table.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -214,12 +218,12 @@
am__v_CXXLD_1 =
SOURCES = basename1.cc cmp-lt.cc csv-formatter.cc dbus-escape.cc \
dirname1.cc equal-date.cc getopts.cc humanstring.cc \
- json-formatter.cc lvm-utils.cc qgroup1.cc sysconfig-get1.cc \
- table-formatter.cc table.cc
+ json-formatter.cc lvm-utils.cc qgroup1.cc scan-datetime.cc \
+ sysconfig-get1.cc table-formatter.cc table.cc
DIST_SOURCES = basename1.cc cmp-lt.cc csv-formatter.cc dbus-escape.cc \
dirname1.cc equal-date.cc getopts.cc humanstring.cc \
- json-formatter.cc lvm-utils.cc qgroup1.cc sysconfig-get1.cc \
- table-formatter.cc table.cc
+ json-formatter.cc lvm-utils.cc qgroup1.cc scan-datetime.cc \
+ sysconfig-get1.cc table-formatter.cc table.cc
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -602,6 +606,7 @@
AM_DEFAULT_SOURCE_EXT = .cc
EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+scan_datetime_test_LDADD = -lboost_unit_test_framework
../client/utils/libutils.la
humanstring_test_LDADD = -lboost_unit_test_framework
../client/utils/libutils.la
table_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
table_formatter_test_LDADD = -lboost_unit_test_framework
../client/utils/libutils.la
@@ -696,6 +701,10 @@
@rm -f qgroup1.test$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(qgroup1_test_OBJECTS) $(qgroup1_test_LDADD)
$(LIBS)
+scan-datetime.test$(EXEEXT): $(scan_datetime_test_OBJECTS)
$(scan_datetime_test_DEPENDENCIES) $(EXTRA_scan_datetime_test_DEPENDENCIES)
+ @rm -f scan-datetime.test$(EXEEXT)
+ $(AM_V_CXXLD)$(CXXLINK) $(scan_datetime_test_OBJECTS)
$(scan_datetime_test_LDADD) $(LIBS)
+
sysconfig-get1.test$(EXEEXT): $(sysconfig_get1_test_OBJECTS)
$(sysconfig_get1_test_DEPENDENCIES) $(EXTRA_sysconfig_get1_test_DEPENDENCIES)
@rm -f sysconfig-get1.test$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(sysconfig_get1_test_OBJECTS)
$(sysconfig_get1_test_LDADD) $(LIBS)
@@ -725,6 +734,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json-formatter.Po@am__quote@
# am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lvm-utils.Po@am__quote@ #
am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgroup1.Po@am__quote@ #
am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scan-datetime.Po@am__quote@ #
am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysconfig-get1.Po@am__quote@
# am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table-formatter.Po@am__quote@
# am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Po@am__quote@ #
am--include-marker
@@ -1059,6 +1069,7 @@
-rm -f ./$(DEPDIR)/json-formatter.Po
-rm -f ./$(DEPDIR)/lvm-utils.Po
-rm -f ./$(DEPDIR)/qgroup1.Po
+ -rm -f ./$(DEPDIR)/scan-datetime.Po
-rm -f ./$(DEPDIR)/sysconfig-get1.Po
-rm -f ./$(DEPDIR)/table-formatter.Po
-rm -f ./$(DEPDIR)/table.Po
@@ -1118,6 +1129,7 @@
-rm -f ./$(DEPDIR)/json-formatter.Po
-rm -f ./$(DEPDIR)/lvm-utils.Po
-rm -f ./$(DEPDIR)/qgroup1.Po
+ -rm -f ./$(DEPDIR)/scan-datetime.Po
-rm -f ./$(DEPDIR)/sysconfig-get1.Po
-rm -f ./$(DEPDIR)/table-formatter.Po
-rm -f ./$(DEPDIR)/table.Po
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/testsuite/equal-date.cc
new/snapper-0.8.15/testsuite/equal-date.cc
--- old/snapper-0.8.15/testsuite/equal-date.cc 2020-12-21 01:00:00.000000000
+0100
+++ new/snapper-0.8.15/testsuite/equal-date.cc 2021-01-25 01:00:00.000000000
+0100
@@ -5,18 +5,25 @@
#include <boost/test/unit_test.hpp>
#include "../client/utils/equal-date.h"
+#include "../snapper/AppUtil.h"
+
+using namespace snapper;
bool
equal_week(const char* s1, const char* s2)
{
+ // use interim time_t since strptime on musl does not set tm_yday
+
+ time_t t1 = scan_datetime(s1, true);
struct tm tmp1;
memset(&tmp1, 0, sizeof(tmp1));
- strptime(s1, "%Y-%m-%d", &tmp1);
+ gmtime_r(&t1, &tmp1);
+ time_t t2 = scan_datetime(s2, true);
struct tm tmp2;
memset(&tmp2, 0, sizeof(tmp2));
- strptime(s2, "%Y-%m-%d", &tmp2);
+ gmtime_r(&t2, &tmp2);
return equal_week(tmp1, tmp2);
}
@@ -25,46 +32,46 @@
BOOST_AUTO_TEST_CASE(test1)
{
// 2012 is a leap year
- BOOST_CHECK(equal_week("2011-12-31", "2012-01-01"));
- BOOST_CHECK(equal_week("2012-01-01", "2011-12-31"));
+ BOOST_CHECK(equal_week("2011-12-31 00:00:00", "2012-01-01 00:00:00"));
+ BOOST_CHECK(equal_week("2012-01-01 00:00:00", "2011-12-31 00:00:00"));
}
BOOST_AUTO_TEST_CASE(test2)
{
// 2012 is a leap year
- BOOST_CHECK(equal_week("2012-12-31", "2013-01-01"));
- BOOST_CHECK(equal_week("2013-01-01", "2012-12-31"));
+ BOOST_CHECK(equal_week("2012-12-31 00:00:00", "2013-01-01 00:00:00"));
+ BOOST_CHECK(equal_week("2013-01-01 00:00:00", "2012-12-31 00:00:00"));
}
BOOST_AUTO_TEST_CASE(test3)
{
// Saturday and Sunday
- BOOST_CHECK(equal_week("2014-01-04", "2014-01-05"));
- BOOST_CHECK(equal_week("2014-01-05", "2014-01-04"));
+ BOOST_CHECK(equal_week("2014-01-04 00:00:00", "2014-01-05 00:00:00"));
+ BOOST_CHECK(equal_week("2014-01-05 00:00:00", "2014-01-04 00:00:00"));
// Sunday and Monday
- BOOST_CHECK(!equal_week("2014-01-05", "2014-01-06"));
- BOOST_CHECK(!equal_week("2014-01-06", "2014-01-05"));
+ BOOST_CHECK(!equal_week("2014-01-05 00:00:00", "2014-01-06 00:00:00"));
+ BOOST_CHECK(!equal_week("2014-01-06 00:00:00", "2014-01-05 00:00:00"));
// Monday and Tuesday
- BOOST_CHECK(equal_week("2014-01-06", "2014-01-07"));
- BOOST_CHECK(equal_week("2014-01-07", "2014-01-06"));
+ BOOST_CHECK(equal_week("2014-01-06 00:00:00", "2014-01-07 00:00:00"));
+ BOOST_CHECK(equal_week("2014-01-07 00:00:00", "2014-01-06 00:00:00"));
}
BOOST_AUTO_TEST_CASE(test4)
{
// 2014-12-31 is a Wednesday, 2015-01-01 is a Thursday
- BOOST_CHECK(equal_week("2014-12-31", "2015-01-01"));
- BOOST_CHECK(equal_week("2015-01-01", "2014-12-31"));
+ BOOST_CHECK(equal_week("2014-12-31 00:00:00", "2015-01-01 00:00:00"));
+ BOOST_CHECK(equal_week("2015-01-01 00:00:00", "2014-12-31 00:00:00"));
}
BOOST_AUTO_TEST_CASE(test5)
{
// 2017-12-31 is a Sunday, 2018-01-01 is a Monday
- BOOST_CHECK(!equal_week("2017-12-31", "2018-01-01"));
- BOOST_CHECK(!equal_week("2018-01-01", "2017-12-31"));
+ BOOST_CHECK(!equal_week("2017-12-31 00:00:00", "2018-01-01 00:00:00"));
+ BOOST_CHECK(!equal_week("2018-01-01 00:00:00", "2017-12-31 00:00:00"));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.15/testsuite/scan-datetime.cc
new/snapper-0.8.15/testsuite/scan-datetime.cc
--- old/snapper-0.8.15/testsuite/scan-datetime.cc 1970-01-01
01:00:00.000000000 +0100
+++ new/snapper-0.8.15/testsuite/scan-datetime.cc 2021-01-25
01:00:00.000000000 +0100
@@ -0,0 +1,30 @@
+
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE snapper
+
+#include <boost/test/unit_test.hpp>
+
+#include "../snapper/AppUtil.h"
+
+using namespace snapper;
+
+
+BOOST_AUTO_TEST_CASE(test1)
+{
+ time_t t1 = scan_datetime("2020-03-04 12:34:56", true);
+
+ struct tm tmp1;
+ memset(&tmp1, 0, sizeof(tmp1));
+ gmtime_r(&t1, &tmp1);
+
+ BOOST_CHECK_EQUAL(tmp1.tm_year, 2020 - 1900);
+ BOOST_CHECK_EQUAL(tmp1.tm_mon, 3 - 1);
+ BOOST_CHECK_EQUAL(tmp1.tm_mday, 4);
+
+ BOOST_CHECK_EQUAL(tmp1.tm_yday, 31 + 28 + 4);
+ BOOST_CHECK_EQUAL(tmp1.tm_wday, 3);
+
+ BOOST_CHECK_EQUAL(tmp1.tm_hour, 12);
+ BOOST_CHECK_EQUAL(tmp1.tm_min, 34);
+ BOOST_CHECK_EQUAL(tmp1.tm_sec, 56);
+}
++++++ snapper-Debian_10.0.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.002705300 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.006705306 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-Debian_9.0.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.026705336 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.026705336 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-Debian_Unstable.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.046705367 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.046705367 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-xUbuntu_17.04.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.082705421 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.082705421 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-xUbuntu_17.10.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.102705452 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.106705459 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-xUbuntu_18.04.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.130705494 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.130705494 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-xUbuntu_18.10.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.150705525 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.150705525 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-xUbuntu_19.04.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.170705555 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.174705562 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-xUbuntu_19.10.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.194705593 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.194705593 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-xUbuntu_20.04.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.218705628 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.222705635 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
++++++ snapper-xUbuntu_20.10.dsc ++++++
--- /var/tmp/diff_new_pack.5eTxeK/_old 2021-02-04 20:22:45.246705672 +0100
+++ /var/tmp/diff_new_pack.5eTxeK/_new 2021-02-04 20:22:45.246705672 +0100
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-d7e0115ac7b512bb2dfb4125cbf4bbcb 632578 snapper-0.8.15.tar.bz2
+97fd83c6c2334816e011988fa599c054 634155 snapper-0.8.15.tar.bz2
