Merge pull request #11 from yast/ycpdoc_sorting

ycpdoc - improved generating index file
yast · Jun 27, 2013 · bbe9de3 · bbe9de3
2 parents 8ed21d9 + 9f3bfba
commit bbe9de3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.24.0
+2.24.1
diff --git a/package/yast2-devtools.changes b/package/yast2-devtools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun 27 06:44:19 UTC 2013 - lslezak@suse.cz
+
+- ycpdoc - improved generating index file, the same functions are
+  additionaly sorted by source file to avoid random order in the
+  output (fixes testsuite failure after upgrading to perl-5.18)
+- 2.24.1
+
 -------------------------------------------------------------------
 Mon Apr  8 10:41:43 UTC 2013 - jreidinger@suse.com
 

diff --git a/ycpdoc/src/ycpdoc b/ycpdoc/src/ycpdoc
@@ -1191,7 +1191,7 @@ sub create_index ($)
 	push @entries, @{$f->{"provides"} || []};
     }
 
-    for my $one ( sort {$a->{"signature"} cmp $b->{"signature"}} @entries )
+    for my $one ( sort { ($a->{"signature"} cmp $b->{"signature"}) || ($a->{"file"} cmp $b->{"file"}) } @entries )
     {
 	if($one->{"kind"} ne "info")
 	{