Hello community,
here is the log from the commit of package snapper for openSUSE:Factory checked
in at 2020-07-30 10:00:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/snapper (Old)
and /work/SRC/openSUSE:Factory/.snapper.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper"
Thu Jul 30 10:00:40 2020 rev:116 rq:823429 version:0.8.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2020-07-16
12:09:51.810443667 +0200
+++ /work/SRC/openSUSE:Factory/.snapper.new.3592/snapper.changes
2020-07-30 10:01:41.279278090 +0200
@@ -1,0 +2,6 @@
+Thu Jul 23 11:52:31 CEST 2020 - aschn...@suse.com
+
+- fixed error when using mksubvolume to create /tmp (bsc#1174401)
+- version 0.8.12
+
+-------------------------------------------------------------------
Old:
----
snapper-0.8.11.tar.bz2
New:
----
snapper-0.8.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snapper.spec ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:42.411278766 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:42.415278768 +0200
@@ -25,7 +25,7 @@
%bcond_with coverage
Name: snapper
-Version: 0.8.11
+Version: 0.8.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: snapper-%{version}.tar.bz2
++++++ debian.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/debian/changelog new/debian/changelog
--- old/debian/changelog 2020-07-15 02:00:00.000000000 +0200
+++ new/debian/changelog 2020-07-29 02:00:00.000000000 +0200
@@ -1,3 +1,27 @@
+snapper (0.8.12) stable; urgency=low
+
+ * Updated to version 0.8.12
+
+ * fixed error when using mksubvolume to create /tmp (bsc#1174401)
+
+ -- Arvin Schnell <aschn...@suse.com> Thu, 23 Jul 23 2020 11:52:31 +0000
+
+snapper (0.8.11) stable; urgency=low
+
+ * Updated to version 0.8.11
+
+ * added error handing for failed ambit detection (bsc#1174038)
+
+ -- Arvin Schnell <aschn...@suse.com> Mon, 13 Jul 2020 11:29:13 +0000
+
+snapper (0.8.10) stable; urgency=low
+
+ * Updated to version 0.8.11
+
+ * special rollback for transactional server (bsc#1172273)
+
+ -- Arvin Schnell <aschn...@suse.com> Tue, 16 Jun 2020 18:31:47 +0000
+
snapper (0.8.9) stable; urgency=low
* Fix "Snapper is not creating the post snapshot" (bsc#1160938)
++++++ snapper-0.8.11.tar.bz2 -> snapper-0.8.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.11/VERSION new/snapper-0.8.12/VERSION
--- old/snapper-0.8.11/VERSION 2020-07-15 02:00:00.000000000 +0200
+++ new/snapper-0.8.12/VERSION 2020-07-29 02:00:00.000000000 +0200
@@ -1 +1 @@
-0.8.11
+0.8.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.11/client/Makefile.am
new/snapper-0.8.12/client/Makefile.am
--- old/snapper-0.8.11/client/Makefile.am 2020-07-15 02:00:00.000000000
+0200
+++ new/snapper-0.8.12/client/Makefile.am 2020-07-29 02:00:00.000000000
+0200
@@ -14,7 +14,7 @@
commands.cc commands.h \
errors.cc errors.h
-libclient_la_LIBADD = utils/libutils.la ../dbus/libdbus.la
+libclient_la_LIBADD = utils/libutils.la ../dbus/libdbus.la
bin_PROGRAMS = snapper
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.11/client/mksubvolume.cc
new/snapper-0.8.12/client/mksubvolume.cc
--- old/snapper-0.8.11/client/mksubvolume.cc 2020-07-15 02:00:00.000000000
+0200
+++ new/snapper-0.8.12/client/mksubvolume.cc 2020-07-29 02:00:00.000000000
+0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) [2015-2017] SUSE LLC
+ * Copyright (c) [2015-2020] SUSE LLC
*
* All Rights Reserved.
*
@@ -47,8 +47,68 @@
bool verbose = false;
+class TmpMountpoint
+{
+
+public:
+
+ TmpMountpoint(const libmnt_fs* fs, const string& subvol_opts);
+ ~TmpMountpoint();
+
+ const string& get_path() const { return path; }
+
+private:
+
+ void do_tmp_mount(const string& subvol_option) const;
+ void do_tmp_umount() const;
+
+ const libmnt_fs* fs;
+ string path;
+
+};
+
+
+TmpMountpoint::TmpMountpoint(const libmnt_fs* fs, const string& subvol_opts)
+ : fs(fs)
+{
+ char tmp[] = "/tmp/mksubvolume-XXXXXX";
+
+ if (mkdtemp(tmp) == nullptr)
+ throw runtime_error_with_errno("mkdtemp failed", errno);
+
+ path = tmp;
+
+ if (verbose)
+ cout << "tmp directory is " << path << endl;
+
+ try
+ {
+ do_tmp_mount(subvol_opts);
+ }
+ catch (...)
+ {
+ rmdir(path.c_str());
+ throw;
+ }
+}
+
+
+TmpMountpoint::~TmpMountpoint()
+{
+ try
+ {
+ do_tmp_umount();
+ rmdir(path.c_str());
+ }
+ catch (...)
+ {
+ cerr << "failed to unmount and remove tmp directory " << path << endl;
+ }
+}
+
+
void
-do_tmp_mount(const libmnt_fs* fs, const char* tmp_mountpoint, const string&
subvol_option)
+TmpMountpoint::do_tmp_mount(const string& subvol_option) const
{
if (verbose)
cout << "do-tmp-mount" << endl;
@@ -59,7 +119,7 @@
struct libmnt_context* cxt = mnt_new_context();
mnt_context_set_fs(cxt, x);
- mnt_context_set_target(cxt, tmp_mountpoint);
+ mnt_context_set_target(cxt, path.c_str());
if (!subvol_option.empty())
mnt_context_set_options(cxt, ("subvol=" + subvol_option).c_str());
else
@@ -75,7 +135,32 @@
void
-do_create_subvolume(const string& tmp_mountpoint, const string& subvolume_name)
+TmpMountpoint::do_tmp_umount() const
+{
+ if (verbose)
+ cout << "do-tmp-umount" << endl;
+
+ system("/usr/bin/udevadm settle --timeout 20");
+
+ libmnt_fs* x = mnt_copy_fs(NULL, fs);
+ if (!x)
+ throw runtime_error("mnt_copy_fs failed");
+
+ struct libmnt_context* cxt = mnt_new_context();
+ mnt_context_set_fs(cxt, x);
+ mnt_context_set_target(cxt, path.c_str());
+
+ int ret = mnt_context_umount(cxt);
+ if (ret != 0)
+ throw runtime_error(sformat("mnt_context_umount failed, ret:%d", ret));
+
+ mnt_free_context(cxt);
+ mnt_free_fs(x);
+}
+
+
+void
+do_create_subvolume_pure(const string& tmp_mountpoint, const string&
subvolume_name)
{
if (verbose)
cout << "do-create-subvolume" << endl;
@@ -89,42 +174,37 @@
if (fd < 0)
throw runtime_error_with_errno("open failed", errno);
- try
- {
- create_subvolume(fd, basename(subvolume_name));
- }
- catch(...)
- {
- close(fd);
- throw;
- }
+ FdCloser fd_closer(fd);
- close(fd);
+ create_subvolume(fd, basename(subvolume_name));
}
void
-do_tmp_umount(const libmnt_fs* fs, const char* tmp_mountpoint)
+do_create_subvolume(const string& subvolume_name, const libmnt_fs* fs, const
string& subvol_option)
{
- if (verbose)
- cout << "do-tmp-umount" << endl;
-
- system("/sbin/udevadm settle --timeout 20");
+ // Note: If the target is /tmp it is important that the tmp mount is
unmounted before
+ // the subvolume itself is mounted.
- libmnt_fs* x = mnt_copy_fs(NULL, fs);
- if (!x)
- throw runtime_error("mnt_copy_fs failed");
+ TmpMountpoint tmp_mountpoint(fs, subvol_option);
- struct libmnt_context* cxt = mnt_new_context();
- mnt_context_set_fs(cxt, x);
- mnt_context_set_target(cxt, tmp_mountpoint);
+ try
+ {
+ do_create_subvolume_pure(tmp_mountpoint.get_path(), subvolume_name);
+ }
+ catch (const runtime_error_with_errno& e)
+ {
+ if (e.error_number != EEXIST)
+ throw;
- int ret = mnt_context_umount(cxt);
- if (ret != 0)
- throw runtime_error(sformat("mnt_context_umount failed, ret:%d", ret));
+ const string path = tmp_mountpoint.get_path() + "/" + subvolume_name;
- mnt_free_context(cxt);
- mnt_free_fs(x);
+ struct stat sb;
+ if (lstat(path.c_str(), &sb) == 0 && is_subvolume(sb))
+ cout << "reusing existing subvolume" << endl;
+ else
+ throw runtime_error_with_errno("cannot reuse path as subvolume",
e.error_number);
+ }
}
@@ -199,17 +279,14 @@
int fd = open(target.c_str(), O_RDONLY);
if (fd == -1)
- {
throw runtime_error_with_errno("open failed", errno);
- }
+
+ FdCloser fd_closer(fd);
unsigned long flags = 0;
if (ioctl(fd, EXT2_IOC_GETFLAGS, &flags) == -1)
- {
- close(fd);
throw runtime_error_with_errno("ioctl(EXT2_IOC_GETFLAGS) failed",
errno);
- }
if (set_nocow)
flags |= FS_NOCOW_FL;
@@ -217,12 +294,7 @@
flags &= ~FS_NOCOW_FL;
if (ioctl(fd, EXT2_IOC_SETFLAGS, &flags) == -1)
- {
- close(fd);
throw runtime_error_with_errno("ioctl(EXT2_IOC_SETFLAGS) failed",
errno);
- }
-
- close(fd);
}
@@ -288,7 +360,7 @@
void
-do_consistency_checks(MntTable& mnt_table, libmnt_fs* fs, libmnt_fs*
expected_fs)
+do_consistency_checks(MntTable& mnt_table, const libmnt_fs* fs, libmnt_fs*
expected_fs)
{
// Set up cache for UUID / LABEL resolution in mnt_table_find_source
libmnt_cache* cache = mnt_new_cache();
@@ -347,42 +419,6 @@
}
-class TmpMountpoint {
- unique_ptr<char[]> mountpoint;
- const libmnt_fs* fs;
-
-public:
- TmpMountpoint(const string& tmpMountpoint, const libmnt_fs* libmntfs,
const string& subvol_opts)
- : mountpoint(strdup(tmpMountpoint.c_str())), fs(libmntfs)
- {
- if (!mkdtemp(mountpoint.get()))
- throw runtime_error_with_errno("mkdtemp failed", errno);
-
- try
- {
- do_tmp_mount(fs, mountpoint.get(), subvol_opts);
- }
- catch (...)
- {
- rmdir(mountpoint.get());
- throw;
- }
- }
-
- ~TmpMountpoint()
- {
- do_tmp_umount(fs, mountpoint.get());
- rmdir(mountpoint.get());
- }
-
- const string
- get_path()
- {
- return mountpoint.get();
- }
-};
-
-
/*
* The used algorithm is as follow:
*
@@ -435,6 +471,8 @@
if (fd == -1)
throw runtime_error_with_errno("open failed", errno);
+ FdCloser fd_closer(fd);
+
subvolid_t default_subvolume_id = get_default_id(fd);
if (verbose)
cout << "default-subvolume-id:" << default_subvolume_id << endl;
@@ -443,7 +481,7 @@
if (verbose)
cout << "default-subvolume-name:" << default_subvolume_name << endl;
- close(fd);
+ fd_closer.close();
// Determine subvol mount-option for tmp mount. The '@' is used on SLE.
@@ -470,27 +508,7 @@
// Execute all steps.
- TmpMountpoint tmp_mountpoint("/tmp/mksubvolume-XXXXXX", fs, subvol_option);
-
- try
- {
- do_create_subvolume(tmp_mountpoint.get_path(), subvolume_name);
- }
- catch (const runtime_error_with_errno& e)
- {
- if (e.error_number == EEXIST)
- {
- const string path = tmp_mountpoint.get_path() + "/" +
subvolume_name;
- struct stat sb;
-
- if (lstat(path.c_str(), &sb) == 0 && is_subvolume(sb))
- cout << "reusing existing subvolume" << endl;
- else
- throw runtime_error_with_errno("cannot reuse path as
subvolume", e.error_number);
- }
- else
- throw;
- }
+ do_create_subvolume(subvolume_name, fs, subvol_option);
do_add_fstab_and_mount(mnt_table, expected_fs);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.11/po/cs.po new/snapper-0.8.12/po/cs.po
--- old/snapper-0.8.11/po/cs.po 2020-07-15 02:00:00.000000000 +0200
+++ new/snapper-0.8.12/po/cs.po 2020-07-29 02:00:00.000000000 +0200
@@ -4,9 +4,10 @@
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-07-13 16:13+0200\n"
-"PO-Revision-Date: 2020-06-30 08:32+0000\n"
+"PO-Revision-Date: 2020-07-29 14:45+0000\n"
"Last-Translator: Aleš Kastner <al...@volny.cz>\n"
-"Language-Team: Czech
<https://l10n.opensuse.org/projects/snapper/master/cs/>\n"
+"Language-Team: Czech <https://l10n.opensuse.org/projects/snapper/master/cs/>"
+"\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -278,10 +279,10 @@
msgstr "Nelze smazat snímek %d, protože je to další snímek k připojení."
msgid "Cannot detect ambit since default subvolume is unknown."
-msgstr ""
+msgstr "Nelze zjistit ambit, protože výchozí podsvazek není znám."
msgid "Cannot do rollback since default subvolume is unknown."
-msgstr ""
+msgstr "Nelze provést rollback, protože výchozí podsvazek není znám."
msgid "Command 'cleanup' needs one arguments."
msgstr "Příkaz 'cleanup' vyžaduje jeden argument."
@@ -573,13 +574,13 @@
msgstr "Snímek se nyní používá."
msgid "The ambit can be specified manually using the --ambit option."
-msgstr ""
+msgstr "Ambit lze určit ručně volbou --ambit."
msgid "The config 'root' does not exist. Likely snapper is not configured."
msgstr "Účet root konfigurace neexistuje. Nástroj Snapper pravděpodobně není
nakonfigurován."
msgid "This can happen if the system was not set up for rollback."
-msgstr ""
+msgstr "Může to nastat, není-li systém nastaven pro rollback."
#. TRANSLATORS: symbol for "tebi bytes" (best keep untranslated)
msgid "TiB"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.11/po/de.po new/snapper-0.8.12/po/de.po
--- old/snapper-0.8.11/po/de.po 2020-07-15 02:00:00.000000000 +0200
+++ new/snapper-0.8.12/po/de.po 2020-07-29 02:00:00.000000000 +0200
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: snapper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-13 16:13+0200\n"
-"PO-Revision-Date: 2020-07-03 11:09+0000\n"
+"POT-Creation-Date: 2020-06-18 11:59+0200\n"
+"PO-Revision-Date: 2020-07-14 12:36+0000\n"
"Last-Translator: Sarah Kriesch <ada.lovel...@gmx.de>\n"
"Language-Team: German
<https://l10n.opensuse.org/projects/snapper/master/de/>\n"
"Language: de\n"
@@ -247,11 +247,11 @@
msgstr "ACL-Fehler."
msgid "Active snapshot is already default snapshot."
-msgstr ""
+msgstr "Aktiver Schnappschuss ist schon Standard-Schnappschuss."
#, c-format
msgid "Ambit is %s."
-msgstr ""
+msgstr "Anwendungsbereich ist %s."
#. TRANSLATORS: symbol for "bytes" (best keep untranslated)
msgid "B"
@@ -444,9 +444,9 @@
msgid "Illegal snapshot."
msgstr "Illegaler Schnappschuss."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid ambit %s."
-msgstr "Ungültiger Schnappschuss '%s'."
+msgstr "Ungültiger Anwendungsbereich %s."
msgid "Invalid configdata."
msgstr "Ungültige Konfigurationsdaten."
@@ -456,7 +456,7 @@
#, c-format
msgid "Invalid machine readable format %s."
-msgstr ""
+msgstr "Ungültiges maschinenlesbares Format %s."
#, c-format
msgid "Invalid snapshot '%s'."
@@ -468,9 +468,9 @@
msgid "Invalid subvolume."
msgstr "Ungültiges Subvolumen."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid table style %s."
-msgstr "Ungültiger Tabellenstil %d."
+msgstr "Ungültiger Tabellenstil %s."
msgid "Invalid user."
msgstr "Ungültiger Benutzer."
@@ -588,7 +588,7 @@
#, c-format
msgid "Use %s, %s or %s."
-msgstr ""
+msgstr "%s, %s oder %s verwenden."
#, c-format
msgid "Use an integer number from %d to %d."
@@ -633,11 +633,12 @@
msgid "nothing to do"
msgstr "keine auszuführenden Aktionen"
-#, fuzzy
msgid ""
"root argument can be used only together with no-dbus.\n"
"Try 'snapper --help' for more information."
-msgstr "Root-Argument kann nur zusammen mit \"no-dbus\" verwendet werden."
+msgstr ""
+"Root-Argument kann nur zusammen mit no-dbus verwendet werden.\n"
+"'snapper --help' für mehr Informationen versuchen."
msgid "usage: snapper [--global-options] <command> [--command-options]
[command-arguments]"
msgstr "Aufruf: snapper [--Globale-Optionen] <Befehl> [--Befehlsoptionen]
[Befehlsargumente]"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.11/po/ja.po new/snapper-0.8.12/po/ja.po
--- old/snapper-0.8.11/po/ja.po 2020-07-15 02:00:00.000000000 +0200
+++ new/snapper-0.8.12/po/ja.po 2020-07-29 02:00:00.000000000 +0200
@@ -9,9 +9,10 @@
"Project-Id-Version: snapper\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-07-13 16:13+0200\n"
-"PO-Revision-Date: 2020-06-30 08:32+0000\n"
+"PO-Revision-Date: 2020-07-29 08:32+0000\n"
"Last-Translator: Yasuhiko Kamata <belphe...@belbel.or.jp>\n"
-"Language-Team: Japanese
<https://l10n.opensuse.org/projects/snapper/master/ja/>\n"
+"Language-Team: Japanese <https://l10n.opensuse.org/projects/snapper/master/";
+"ja/>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -272,10 +273,10 @@
msgstr "スナップショット %d は次回マウントされるスナップショットであるため、削除できません。"
msgid "Cannot detect ambit since default subvolume is unknown."
-msgstr ""
+msgstr "既定のサブボリュームが未知のものであるため、領域を検出できません。"
msgid "Cannot do rollback since default subvolume is unknown."
-msgstr ""
+msgstr "既定のサブボリュームが未知のものであるため、ロールバックできません。"
msgid "Command 'cleanup' needs one arguments."
msgstr "'cleanup' コマンドには 1 つのパラメータが必要です。"
@@ -550,13 +551,13 @@
msgstr "スナップショットは使用中です。"
msgid "The ambit can be specified manually using the --ambit option."
-msgstr ""
+msgstr "領域を指定したい場合は、 --ambit オプションをお使いください。"
msgid "The config 'root' does not exist. Likely snapper is not configured."
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"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.11/po/pt_BR.po
new/snapper-0.8.12/po/pt_BR.po
--- old/snapper-0.8.11/po/pt_BR.po 2020-07-15 02:00:00.000000000 +0200
+++ new/snapper-0.8.12/po/pt_BR.po 2020-07-29 02:00:00.000000000 +0200
@@ -8,10 +8,11 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-13 16:13+0200\n"
-"PO-Revision-Date: 2019-10-15 16:53+0000\n"
-"Last-Translator: Rodrigo Macedo <rmsolucoeseminformat...@gmail.com>\n"
-"Language-Team: Portuguese (Brazil)
<https://l10n.opensuse.org/projects/snapper/master/pt_BR/>\n"
+"POT-Creation-Date: 2020-06-18 11:59+0200\n"
+"PO-Revision-Date: 2020-07-14 12:36+0000\n"
+"Last-Translator: Leonardo Teodoro <leonardosilvateod...@hotmail.com>\n"
+"Language-Team: Portuguese (Brazil) <https://l10n.opensuse.org/projects/";
+"snapper/master/pt_BR/>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@
"X-Generator: Weblate 3.6.1\n"
msgid "\t--ambit, -a ambit\t\tOperate in the specified ambit."
-msgstr ""
+msgstr "\t--ambit, -a ambit\t\tOpere no âmbito especificado."
msgid "\t--cleanup-algorithm, -c <algo>\tCleanup algorithm for snapshot."
msgstr "\t--cleanup-algorithm, -c <algoritmo>\tAlgoritmo de limpeza do
instantâneo."
@@ -35,7 +36,7 @@
msgstr "\t--config, -c <nome>\t\tNome do conjunto de configurações a utilizar."
msgid "\t--csvout\t\t\tSet CSV output format."
-msgstr ""
+msgstr "\t--csvout\t\t\tDefina o formato de saída CSV."
msgid "\t--description, -d <description>\tDescription for snapshot."
msgstr "\t--description, -d <descrição>\tDescrição do instantâneo."
@@ -65,10 +66,12 @@
msgstr "\t--iso\t\t\t\tExibir datas e horas no formato ISO."
msgid "\t--jsonout\t\t\tSet JSON output format."
-msgstr ""
+msgstr "\t--jsonout\t\t\tDefina o formato de saída JSON."
msgid "\t--machine-readable <format>\tSet a machine-readable output format
(csv, json)."
msgstr ""
+"\t--machine-readable <formato>\tDefina um formato de saída legível para "
+"máquina (csv, json)."
msgid "\t--no-dbus\t\t\tOperate without DBus."
msgstr "\t--no-dbus\t\t\tOperar sem DBus."
@@ -99,6 +102,8 @@
msgid "\t--separator <separator>\t\tCharacter separator for CSV output format."
msgstr ""
+"\t--separator <separador>\t\tSeparador de caracteres para o formato de saída "
+"CSV."
msgid "\t--sync, -s\t\t\tSync after deletion."
msgstr "\t--sync, -s\t\t\tSincronizar após exclusão."
@@ -249,11 +254,11 @@
msgstr "Erro ACL."
msgid "Active snapshot is already default snapshot."
-msgstr ""
+msgstr "Snapshot ativa já é a snapshot padrão."
#, c-format
msgid "Ambit is %s."
-msgstr ""
+msgstr "O âmbito é %s."
#. TRANSLATORS: symbol for "bytes" (best keep untranslated)
msgid "B"
@@ -446,9 +451,9 @@
msgid "Illegal snapshot."
msgstr "Instantâneo ilegal."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid ambit %s."
-msgstr "Instantâneo inválido '%s'."
+msgstr "O âmbito %s é inválido."
msgid "Invalid configdata."
msgstr "Arquivo de dados de configuração inválido."
@@ -458,7 +463,7 @@
#, c-format
msgid "Invalid machine readable format %s."
-msgstr ""
+msgstr "Formato legível para máquina inválido %s."
#, c-format
msgid "Invalid snapshot '%s'."
@@ -470,9 +475,9 @@
msgid "Invalid subvolume."
msgstr "Subvolume inválido."
-#, fuzzy, c-format
+#, c-format
msgid "Invalid table style %s."
-msgstr "Estilo de tabela inválido %d."
+msgstr "Estilo de tabela inválido %s."
msgid "Invalid user."
msgstr "Usuário inválido."
@@ -590,7 +595,7 @@
#, c-format
msgid "Use %s, %s or %s."
-msgstr ""
+msgstr "Use %s, %s ou %s."
#, c-format
msgid "Use an integer number from %d to %d."
@@ -635,11 +640,12 @@
msgid "nothing to do"
msgstr "nada a fazer"
-#, fuzzy
msgid ""
"root argument can be used only together with no-dbus.\n"
"Try 'snapper --help' for more information."
-msgstr "É possível usar o argumento root apenas com no-dbus."
+msgstr ""
+"O argumento raiz pode ser usado apenas junto com o no-dbus.\n"
+"Tente 'snapper --help' para mais informações."
msgid "usage: snapper [--global-options] <command> [--command-options]
[command-arguments]"
msgstr "uso: snapper [--opções-globais] <comando> [--opções-do-comando]
[argumentos]"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.11/snapper/AppUtil.h
new/snapper-0.8.12/snapper/AppUtil.h
--- old/snapper-0.8.11/snapper/AppUtil.h 2020-07-15 02:00:00.000000000
+0200
+++ new/snapper-0.8.12/snapper/AppUtil.h 2020-07-29 02:00:00.000000000
+0200
@@ -27,6 +27,7 @@
#include <sys/types.h>
#include <pwd.h>
#include <grp.h>
+#include <unistd.h>
#include <sstream>
#include <locale>
#include <string>
@@ -110,6 +111,38 @@
};
+
+ struct FdCloser
+ {
+ FdCloser(int fd)
+ : fd(fd)
+ {
+ }
+
+ ~FdCloser()
+ {
+ if (fd > -1 )
+ ::close(fd);
+ }
+
+ void reset()
+ {
+ fd = -1;
+ }
+
+ int close()
+ {
+ int r = ::close(fd);
+ fd = -1;
+ return r;
+ }
+
+ private:
+
+ int fd;
+
+ };
+
string sformat(const char* format, ...) __attribute__ ((format(printf, 1,
2)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.8.11/snapper/Btrfs.cc
new/snapper-0.8.12/snapper/Btrfs.cc
--- old/snapper-0.8.11/snapper/Btrfs.cc 2020-07-15 02:00:00.000000000 +0200
+++ new/snapper-0.8.12/snapper/Btrfs.cc 2020-07-29 02:00:00.000000000 +0200
@@ -1239,38 +1239,6 @@
};
- struct FdCloser
- {
- FdCloser(int fd)
- : fd(fd)
- {
- }
-
- ~FdCloser()
- {
- if (fd > -1 )
- ::close(fd);
- }
-
- void reset()
- {
- fd = -1;
- }
-
- int close()
- {
- int r = ::close(fd);
- fd = -1;
- return r;
- }
-
- private:
-
- int fd;
-
- };
-
-
bool
StreamProcessor::dumper(int fd)
{
++++++ snapper-Debian_10.0.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.039279141 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.039279141 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-Debian_7.0.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.059279153 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.059279153 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-Debian_8.0.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.075279162 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.079279165 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-Debian_9.0.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.095279174 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.095279174 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_14.04.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.115279186 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.115279186 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_14.10.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.131279196 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.131279196 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_15.04.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.147279205 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.147279205 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_15.10.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.167279217 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.167279217 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_16.04.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.183279227 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.187279229 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_16.10.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.203279239 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.203279239 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_17.04.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.223279251 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.223279251 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_17.10.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.247279265 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.247279265 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_18.04.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.263279275 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.263279275 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_18.10.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.283279286 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.287279289 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_19.04.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.303279298 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.303279298 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_19.10.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.319279308 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.319279308 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
++++++ snapper-xUbuntu_20.04.dsc ++++++
--- /var/tmp/diff_new_pack.7xuJBY/_old 2020-07-30 10:01:43.343279322 +0200
+++ /var/tmp/diff_new_pack.7xuJBY/_new 2020-07-30 10:01:43.347279325 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.8.11
+Version: 0.8.12
Binary: snapper
Maintainer: Arvin Schnell <aschn...@suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-2e9ab35e11595871fbaf628e6960364d 619701 snapper-0.8.11.tar.bz2
+aafe5e7cc5ebb47acbfc8321e67b2b91 621015 snapper-0.8.12.tar.bz2
