Attachment 9598 Details for Bug 10640 – Patch to make pkg.c sort output in order packages were given

Patch to make pkg.c sort output in order packages were given

pkg_c.patch (text/x-patch), 2.00 KB, created by Peter O'Gorman, The Written Word, Inc. on 2007-04-13 12:42:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter O'Gorman, The Written Word, Inc.

Created: 2007-04-13 12:42:26 UTC

Size: 2.00 KB

patch

obsolete

>Index: pkg.c
>===================================================================
>--- pkg.c.orig	2006-08-16 19:01:04.000000000 +0000
>+++ pkg.c	2007-04-13 17:33:07.169301000 +0000
>@@ -396,13 +396,13 @@
> Package *
> get_package (const char *name)
> {
>-  return internal_get_package (name, TRUE, TRUE);
>+  return internal_get_package (name, TRUE, FALSE);
> }
> 
> Package *
> get_package_quiet (const char *name)
> {
>-  return internal_get_package (name, FALSE, TRUE);
>+  return internal_get_package (name, FALSE, FALSE);
> }
> 
> static GSList*
>@@ -671,29 +671,47 @@
>            GSList **listp, gboolean in_path_order, gboolean include_private)
> {
>   GSList *tmp;
>+  GSList * tmp2;
>   GSList *expanded;
>-
>   expanded = NULL;
>   tmp = packages;
>+  tmp2 = NULL;
>   while (tmp != NULL)
>     {
>       expanded = g_slist_append (expanded, tmp->data);
>       recursive_fill_list (tmp->data,
> 			   include_private ? get_requires_private : get_requires,
> 			   &expanded);
>+      if (in_path_order)
>+        {
>+          spew_package_list("original",expanded);
>+
>+          expanded = packages_sort_by_path_position (expanded);
>+      
>+          spew_package_list ("sorted", expanded);
>+
>+          /* In the case that we want things sorted by path, we also
>+           * want them sorted by order that they appear on the command
>+           * line, so we sort each package, one by one, and then cat
>+           * them all together at the end. */
>+
>+          tmp2 = g_slist_append(tmp2,expanded->data);
>+
>+          recursive_fill_list (expanded->data,
>+                   include_private ? get_requires_private : get_requires,
>+                   &tmp2);
> 
>+          g_slist_free (expanded);
>+
>+          expanded = NULL;
>+        }
>       tmp = tmp->next;
>-    }
> 
>+    }
>   if (in_path_order)
>     {
>-      spew_package_list ("original", expanded);
>-      
>-      expanded = packages_sort_by_path_position (expanded);
>-      
>-      spew_package_list ("sorted", expanded);
>+      expanded = tmp2;
>     }
>-  
>   tmp = expanded;
>   while (tmp != NULL)
>     {

Actions: View

Attachments on bug 10640: 9598 | 9614 | 10814

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.