From 443a19eaf4cf4c214d600b20f05851e0ac7c5f31 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Jul 27 2016 11:57:19 +0000
Subject: Add James' Fedora groups modules into default fm.modules.d directory


---

diff --git a/cfg/fm.modules.d/fedora.cfg b/cfg/fm.modules.d/fedora.cfg
deleted file mode 100644
index 10454d7..0000000
--- a/cfg/fm.modules.d/fedora.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[fedora]
-name = Fedora modules
-url = http://fed-mod.org/dev/modules
-enabled = 1
diff --git a/cfg/fm.modules.d/fm_testing_modules.cfg b/cfg/fm.modules.d/fm_testing_modules.cfg
new file mode 100644
index 0000000..7587774
--- /dev/null
+++ b/cfg/fm.modules.d/fm_testing_modules.cfg
@@ -0,0 +1,4 @@
+[fm_testing_modules]
+name = FM project testing modules
+url = http://fed-mod.org/dev/modules
+enabled = 1
diff --git a/cfg/fm.modules.d/modularity.cfg b/cfg/fm.modules.d/modularity.cfg
new file mode 100644
index 0000000..20d5784
--- /dev/null
+++ b/cfg/fm.modules.d/modularity.cfg
@@ -0,0 +1,9 @@
+[fedora-24-modularity]
+name = Fedora 24 groups as modules
+url = http://dev.fed-mod.org/modularity/fedora-24-mod
+enabled = 1
+
+[fedora-dev-modularity]
+name = Fedora rawhide groups as modules
+url = http://dev.fed-mod.org/modularity/fedora-dev-mod
+enabled = 1
diff --git a/fm/module.py b/fm/module.py
index b95c8dd..f42ee28 100644
--- a/fm/module.py
+++ b/fm/module.py
@@ -93,7 +93,7 @@ class Module(object):
                 return
 
             raise fm.exceptions.Error(
-                "Cannot execute dnf command: {}".format(cmd)
+                "Cannot execute dnf command: {}\n{}".format(cmd, out)
                 )
 
     def _install_profile_rpms(self, profile_name):