aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec5
-rwxr-xr-xsystemd/fedora-import-state2
2 files changed, 5 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 54b7bcb4..8f1bfdbd 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: Scripts to bring up network interfaces and legacy utilities
Name: initscripts
-Version: 9.68
+Version: 9.69
License: GPLv2
Group: System Environment/Base
Release: 1%{?dist}
@@ -177,6 +177,9 @@ fi
%{_sysconfdir}/profile.d/debug*
%changelog
+* Tue Aug 30 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 9.69-1
+- fedora-import-state should no longer try to create folder with empty name (#1370259)
+
* Tue Aug 9 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 9.68-1
- fedora-import-state: skip modifying of existing folders (#1347436)
- functions: systemctl show now returns an error when unit does not exist
diff --git a/systemd/fedora-import-state b/systemd/fedora-import-state
index c34ad0f8..16447026 100755
--- a/systemd/fedora-import-state
+++ b/systemd/fedora-import-state
@@ -17,7 +17,7 @@ for dir in $dirs_found; do
dest_dir="${dir/\./}"
# Create destination folder if it does not exist (with the same rights):
- if ! [[ -d "$dest_dir" ]]; then
+ if [[ -n "$dest_dir" && ! -d "$dest_dir" ]]; then
mkdir -p "$dest_dir"
chmod --reference="$PWD" "$dest_dir"
chown --reference="$PWD" "$dest_dir"