Merge pull request #1014 from werwty/bugfix/1086

Ignore repodata/* when syncing from pulp_distribution.xml
pulp · Jan 13, 2017 · 65525da · 65525da
2 parents c4e4e60 + 14a637b
commit 65525da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/plugins/pulp_rpm/plugins/importers/yum/parse/treeinfo.py b/plugins/pulp_rpm/plugins/importers/yum/parse/treeinfo.py
@@ -435,11 +435,12 @@ def process_distribution(self, tmp_dir):
             root = tree.getroot()
             for file_element in root.findall('file'):
                 relative_path = file_element.text
-                files.append({
-                    RELATIVE_PATH: relative_path,
-                    CHECKSUM: None,
-                    CHECKSUM_TYPE: None,
-                })
+                if not relative_path.startswith('repodata/'):
+                    files.append({
+                        RELATIVE_PATH: relative_path,
+                        CHECKSUM: None,
+                        CHECKSUM_TYPE: None,
+                    })
 
             # Add the distribution file to the list of files
             files.append({

diff --git a/plugins/test/data/pulp_distribution/distribution_good.xml b/plugins/test/data/pulp_distribution/distribution_good.xml
@@ -1 +1 @@
-<pulp_distribution version="1"><file>foo/bar.txt</file><file>baz/qux.txt</file></pulp_distribution>
+<pulp_distribution version="1"><file>foo/bar.txt</file><file>baz/qux.txt</file><file>repodata/abc.txt</file></pulp_distribution>