Merge lp:~therve/pyjuju/ignore-dot-files into lp:pyjuju

[Thomas Herve]

Charm repo ignores entry with leading '.'

Minor optimization to skip invalid entries.

[Kapil Thangavelu (hazmat)]

lgtm, thanks

review: Approve

[Kapil Thangavelu (hazmat)]

*** Submitted:

Charm repo ignores entry with leading '.'

Minor optimization to skip invalid entries.

=== modified file 'juju/charm/repository.py'
--- juju/charm/repository.py	2012-04-04 13:00:13 +0000
+++ juju/charm/repository.py	2012-05-03 18:48:26 +0000
@@ -50,6 +50,8 @@
             return
 
         for dentry in os.listdir(path):
+            if dentry.startswith("."):
+                continue
             dentry_path = os.path.join(path, dentry)
             try:
                 yield get_charm_from_path(dentry_path)

=== modified file 'juju/charm/tests/test_repository.py'
--- juju/charm/tests/test_repository.py	2012-03-27 20:07:54 +0000
+++ juju/charm/tests/test_repository.py	2012-05-03 18:48:26 +0000
@@ -174,6 +174,20 @@
             "%s/series/mysql/config.yaml" % self.repository1.path, output)
 
     @inlineCallbacks
+    def test_ignore_dot_files(self):
+        """Dot files are ignored when browsing the repository."""
+        fh = open(
+            os.path.join(
+                self.repository1.path, "series", ".foo"),
+            "w+")
+
+        fh.write("Something")
+        fh.close()
+        yield self.repository1.find(self.charm_url("sample"))
+        output = self.output.getvalue()
+        self.assertNotIn("Charm '.foo' has an error", output)
+
+    @inlineCallbacks
     def test_invalid_charm_config_ignored(self):
         fh = open(
             os.path.join(