Merge lp:~sergiusens/snapcraft/recommendedOptions into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Recommends defaulting to None when not part of options

[Leo Arias (elopio)]

Good.

review: Approve

=== modified file 'snapcraft/plugins/tests/test_ubuntu.py'
--- snapcraft/plugins/tests/test_ubuntu.py	2015-08-05 15:39:18 +0000
+++ snapcraft/plugins/tests/test_ubuntu.py	2015-08-06 01:01:56 +0000
@@ -51,3 +51,11 @@
         self.assertEqual(os.readlink(tempdir + '/abs-to-b'), '/b')
         self.assertEqual(os.readlink(tempdir + '/rel-to-1'), '1')
         self.assertEqual(os.readlink(tempdir + '/abs-to-1'), '1')
+
+    def test_recommends_ignored_properly(self):
+        class Options:
+            packages = ['my-excellent-package']
+        ubuntu = UbuntuPlugin('myplug', Options())
+
+        self.assertTrue('my-excellent-package' in ubuntu.included_packages)
+        self.assertEqual(ubuntu.recommends, None)

=== modified file 'snapcraft/plugins/ubuntu.py'
--- snapcraft/plugins/ubuntu.py	2015-08-05 20:19:47 +0000
+++ snapcraft/plugins/ubuntu.py	2015-08-06 01:01:56 +0000
@@ -42,7 +42,7 @@
                 sys.exit(1)
             self.included_packages.append(name)
 
-        self.recommends = options.recommends or False
+        self.recommends = getattr(options, 'recommends', None)
 
     def pull(self):
         self.downloadable_packages = self.get_all_dep_packages(self.included_packages)