prevent requirements from leaking into autorequired objects and creating circular references

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

Conflicts:
	cdist/test/autorequire/__init__.py

cdist/test/autorequire/__init__.py

@@ -83,3 +83,9 @@ class AutorequireTestCase(test.CdistTestCase):
         self.config.stage_prepare()
         # raises CircularDependecyError
         self.config.stage_run()
+
+    def test_recursive_type(self):
+        self.context.initial_manifest = os.path.join(self.config.local.manifest_path, 'recursive_type')
+        self.config.stage_prepare()
+        # raises CircularDependecyError
+        self.config.stage_run()

cdist/test/autorequire/fixtures/conf/manifest/recursive_type

@@ -0,0 +1,2 @@
+__git foo
+require="__git/foo" __git bar

cdist/test/autorequire/fixtures/conf/type/__git/manifest

@@ -0,0 +1 @@
+__package git