Hello community,
here is the log from the commit of package targetcli-fb for openSUSE:Factory
checked in at 2018-04-22 14:40:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/targetcli-fb (Old)
and /work/SRC/openSUSE:Factory/.targetcli-fb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "targetcli-fb"
Sun Apr 22 14:40:48 2018 rev:9 rq:599503 version:2.1.47
Changes:
--------
--- /work/SRC/openSUSE:Factory/targetcli-fb/targetcli-fb.changes
2018-04-19 15:29:22.611329779 +0200
+++ /work/SRC/openSUSE:Factory/.targetcli-fb.new/targetcli-fb.changes
2018-04-22 14:40:49.226404083 +0200
@@ -1,0 +2,7 @@
+Fri Apr 20 19:13:39 UTC 2018 - ldun...@suse.com
+
+- Only save current config to backup if current
+ config exists (bsc#1090424), adding patch:
+ * targetcli-only-save-old-config-if-present.patch
+
+-------------------------------------------------------------------
New:
----
targetcli-only-save-old-config-if-present.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ targetcli-fb.spec ++++++
--- /var/tmp/diff_new_pack.yIOy4P/_old 2018-04-22 14:40:50.378362401 +0200
+++ /var/tmp/diff_new_pack.yIOy4P/_new 2018-04-22 14:40:50.382362256 +0200
@@ -58,6 +58,7 @@
Patch2: Use-signed-char-instead-of-char.patch
Patch3: Split-out-blockdev-readonly-state-detection-helper.patch
Patch4: rbd-support.patch
+Patch5: targetcli-only-save-old-config-if-present.patch
%python_subpackages
@@ -89,6 +90,7 @@
# RBD support is dependent on LIO changes present in the SLE/Leap kernel
%patch4 -p1
%endif
+%patch5 -p1
%build
%python_build
++++++ targetcli-only-save-old-config-if-present.patch ++++++
From: Lee Duncan <ldun...@suse.com>
Date: Fri Apr 20 12:07:30 PDT 2018
Subject: [PATCH] targetcli: only save old config if present
There is no reason to copy the current configuration to the
backup directory if there is no current configuration.
Already fixed upstream, but the code is totally different
there.
Signed-off-by: Lee Duncan <ldun...@suse.com>
---
--- a/targetcli/ui_root.py 2018-04-20 11:53:58.987907240 -0700
+++ b/targetcli/ui_root.py 2018-04-20 11:56:35.231375345 -0700
@@ -70,7 +70,7 @@ class UIRoot(UINode):
savefile = os.path.expanduser(savefile)
# Only save backups if saving to default location
- if savefile == default_save_file:
+ if (savefile == default_save_file) and os.path.exists(savefile):
backup_dir = os.path.dirname(savefile) + "/backup"
backup_name = "saveconfig-" + \
datetime.now().strftime("%Y%m%d-%H:%M:%S") + ".json"
