From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 27 Aug 2020 10:21:04 +0000 (+0200)
Subject: - coding style
X-Git-Tag: v0.8.13~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F548%2Fhead;p=thirdparty%2Fsnapper.git

- coding style
---

diff --git a/snapper/Hooks.cc b/snapper/Hooks.cc
index 923e459a..abd9e30d 100644
--- a/snapper/Hooks.cc
+++ b/snapper/Hooks.cc
@@ -70,10 +70,12 @@ namespace snapper
     Hooks::grub(const string& subvolume, const Filesystem* filesystem, const char* option)
     {
 #ifdef ENABLE_ROLLBACK
-	if (subvolume == "/" && filesystem->fstype() == "btrfs" &&
-	    access("/usr/lib/snapper/plugins/grub", X_OK) == 0)
+
+#define GRUB_SCRIPT "/usr/lib/snapper/plugins/grub"
+
+	if (subvolume == "/" && filesystem->fstype() == "btrfs" && access(GRUB_SCRIPT, X_OK) == 0)
 	{
-	    SystemCmd cmd(string("/usr/lib/snapper/plugins/grub ") + option);
+	    SystemCmd cmd(string(GRUB_SCRIPT) + " " + option);
 	}
 #endif
     }
@@ -83,6 +85,7 @@ namespace snapper
     Hooks::rollback(const string& old_root, const string& new_root)
     {
 #ifdef ENABLE_ROLLBACK
+
 #define ROLLBACK_SCRIPT "/usr/lib/snapper/plugins/rollback"
 
 	// Fate#319108
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 31ec8117..431f87cb 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -11,7 +11,7 @@ check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test		    \
 	csv-formatter.test json-formatter.test
 
 if ENABLE_BTRFS_QUOTA
-check_PROGRAMS +=  qgroup1.test
+check_PROGRAMS += qgroup1.test
 endif
 
 TESTS = $(check_PROGRAMS)