added is_nominated_arch_dep info
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 14 May 2011 09:23:57 +0000 (09:23 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 14 May 2011 09:23:57 +0000 (09:23 +0000)
src/lp.c
src/lp.h
src/lp_json.c
src/main.c

index 752d397..c80210b 100644 (file)
--- a/src/lp.c
+++ b/src/lp.c
@@ -86,7 +86,8 @@ char *get_archive_url(const char *owner, const char *ppa)
 
 struct distro_arch_series *distro_arch_series_new(const char *display_name,
                                                  const char *title,
-                                                 const char *architecture_tag)
+                                                 const char *architecture_tag,
+                                                 int is_nominated_arch_indep)
 {
        struct distro_arch_series *d;
 
@@ -95,6 +96,7 @@ struct distro_arch_series *distro_arch_series_new(const char *display_name,
        d->display_name = strdup(display_name);
        d->title = strdup(title);
        d->architecture_tag = strdup(architecture_tag);
+       d->is_nominated_arch_indep = is_nominated_arch_indep;
 
        return d;
 }
@@ -107,6 +109,7 @@ void distro_arch_series_free(struct distro_arch_series *d)
 
        free(d);
 }
+
 void distro_arch_series_list_free(struct distro_arch_series **list)
 {
        if (list) {
@@ -144,3 +147,4 @@ int list_length(void **list)
 
        return n;
 }
+
index 0579a08..edb87d3 100644 (file)
--- a/src/lp.h
+++ b/src/lp.h
@@ -42,13 +42,15 @@ struct distro_arch_series {
        char *display_name;
        char *title;
        char *architecture_tag;
+       int is_nominated_arch_indep;
 };
 
 void daily_download_total_list_free(struct daily_download_total **);
 
 struct distro_arch_series *distro_arch_series_new(const char *display_name,
                                                  const char *title,
-                                                 const char *architecture_tag);
+                                                 const char *architecture_tag,
+                                                 int is_nominated_arch_indep);
 
 void distro_arch_series_free(struct distro_arch_series *);
 
index d6a2179..088d189 100644 (file)
@@ -57,6 +57,8 @@ struct distro_arch_series *json_object_to_distro_arch_series(json_object *o)
        const char *display_name;
        const char *title;
        const char *architecture_tag;
+       boolean is_nominated_arch_indep;
+
 
        display_name = json_object_get_string
                (json_object_object_get(o, "display_name"));
@@ -67,9 +69,13 @@ struct distro_arch_series *json_object_to_distro_arch_series(json_object *o)
        architecture_tag = json_object_get_string
                (json_object_object_get(o, "architecture_tag"));
 
+       is_nominated_arch_indep = json_object_get_boolean
+               (json_object_object_get(o, "is_nominated_arch_indep"));
+
        return distro_arch_series_new(display_name,
                                      title,
-                                     architecture_tag);
+                                     architecture_tag,
+                                     is_nominated_arch_indep);
 }
 
 struct binary_package_publishing_history * *
index 0df293d..ff263e7 100644 (file)
@@ -41,7 +41,9 @@ static void display_published_binaries(const char *owner, const char *ppa)
                exit(EXIT_FAILURE);
        }
 
-       e_cur = list;
+       list = binary_package_publishing_history_list_uniq_noarch_dep(list);
+
+       e_cur = flist;
        while (*e_cur) {
                struct binary_package_publishing_history *binary;
                struct distro_arch_series *dist;