Merge pull request #72 from yast/skip_dirs

ag_zypp_repos - do not try parsing directory entries (bnc#867911)
yast · Jul 29, 2014 · 39a65d5 · 39a65d5
2 parents 63d066e + 42ce6a7
commit 39a65d5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul 29 15:52:43 UTC 2014 - lslezak@suse.cz
+
+- ag_zypp_repos - do not try parsing directory entries in
+  /etc/zypp/repos.d/, that leads to invalid values (bnc#867911)
+- 3.1.35
+
 -------------------------------------------------------------------
 Tue Jul 29 13:22:35 UTC 2014 - jreidinger@suse.com
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.1.34
+Version:        3.1.35
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/servers_non_y2/ag_zypp_repos b/src/servers_non_y2/ag_zypp_repos
@@ -38,6 +38,12 @@ while (<STDIN>) {
 	    my $this_entry = {};
 
 	    $file = $dir.'/'.$file;
+
+            if (-d $file) {
+                y2warning($file." is a directory, skipping");
+                next;
+            }
+
 	    y2milestone ("Parsing file: ".$file);
 	    open (FILE, $file) || do {
 		y2error ("Cannot open file ".$file.": ".$!);