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