|
Matej Habrnal |
fc77ae |
From 6171adb8111747550e5093cd673e2f254ec1b7c9 Mon Sep 17 00:00:00 2001
|
|
Matej Habrnal |
fc77ae |
From: Matej Habrnal <mhabrnal@redhat.com>
|
|
Matej Habrnal |
fc77ae |
Date: Wed, 26 Aug 2015 13:18:26 +0200
|
|
Matej Habrnal |
fc77ae |
Subject: [PATCH] bodhi: add ignoring of Rawhide
|
|
Matej Habrnal |
fc77ae |
|
|
Matej Habrnal |
fc77ae |
Resolves: rhbz#1256493
|
|
Matej Habrnal |
fc77ae |
|
|
Matej Habrnal |
fc77ae |
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
|
|
Matej Habrnal |
fc77ae |
---
|
|
Matej Habrnal |
fc77ae |
src/plugins/bodhi.c | 17 ++++++++++++++++-
|
|
Matej Habrnal |
fc77ae |
1 file changed, 16 insertions(+), 1 deletion(-)
|
|
Matej Habrnal |
fc77ae |
|
|
Matej Habrnal |
fc77ae |
diff --git a/src/plugins/bodhi.c b/src/plugins/bodhi.c
|
|
Matej Habrnal |
fc77ae |
index 831f5ff..9149347 100644
|
|
Matej Habrnal |
fc77ae |
--- a/src/plugins/bodhi.c
|
|
Matej Habrnal |
fc77ae |
+++ b/src/plugins/bodhi.c
|
|
Matej Habrnal |
fc77ae |
@@ -422,6 +422,10 @@ int main(int argc, char **argv)
|
|
Matej Habrnal |
fc77ae |
{
|
|
Matej Habrnal |
fc77ae |
if (release)
|
|
Matej Habrnal |
fc77ae |
{
|
|
Matej Habrnal |
fc77ae |
+ /* There are no bodhi updates for Rawhide */
|
|
Matej Habrnal |
fc77ae |
+ if (strcasecmp(release, "rawhide") == 0)
|
|
Matej Habrnal |
fc77ae |
+ error_msg_and_die("Reselase \"%s\" is not supported",release);
|
|
Matej Habrnal |
fc77ae |
+
|
|
Matej Habrnal |
fc77ae |
query = strbuf_append_strf(query, "releases=%s&", release);
|
|
Matej Habrnal |
fc77ae |
}
|
|
Matej Habrnal |
fc77ae |
else
|
|
Matej Habrnal |
fc77ae |
@@ -439,10 +443,21 @@ int main(int argc, char **argv)
|
|
Matej Habrnal |
fc77ae |
map_string_t *osinfo = new_map_string();
|
|
Matej Habrnal |
fc77ae |
problem_data_get_osinfo(problem_data, osinfo);
|
|
Matej Habrnal |
fc77ae |
parse_osinfo_for_rhts(osinfo, &product, &version);
|
|
Matej Habrnal |
fc77ae |
- query = strbuf_append_strf(query, "releases=f%s&", version);
|
|
Matej Habrnal |
fc77ae |
+
|
|
Matej Habrnal |
fc77ae |
+ /* There are no bodhi updates for Rawhide */
|
|
Matej Habrnal |
fc77ae |
+ bool rawhide = strcasecmp(release, "rawhide") == 0;
|
|
Matej Habrnal |
fc77ae |
+ if (!rawhide)
|
|
Matej Habrnal |
fc77ae |
+ query = strbuf_append_strf(query, "releases=f%s&", version);
|
|
Matej Habrnal |
fc77ae |
+
|
|
Matej Habrnal |
fc77ae |
free(product);
|
|
Matej Habrnal |
fc77ae |
free(version);
|
|
Matej Habrnal |
fc77ae |
free_map_string(osinfo);
|
|
Matej Habrnal |
fc77ae |
+
|
|
Matej Habrnal |
fc77ae |
+ if (rawhide)
|
|
Matej Habrnal |
fc77ae |
+ {
|
|
Matej Habrnal |
fc77ae |
+ strbuf_free(query);
|
|
Matej Habrnal |
fc77ae |
+ error_msg_and_die("Reselase \"Rawhide\" is not supported");
|
|
Matej Habrnal |
fc77ae |
+ }
|
|
Matej Habrnal |
fc77ae |
}
|
|
Matej Habrnal |
fc77ae |
}
|
|
Matej Habrnal |
fc77ae |
|
|
Matej Habrnal |
fc77ae |
--
|
|
Matej Habrnal |
fc77ae |
2.5.0
|
|
Matej Habrnal |
fc77ae |
|