|
 |
bd4bcc |
From 76e32ad40bb4cc27e13818be5c2acc4a70197c9e Mon Sep 17 00:00:00 2001
|
|
|
bd4bcc |
From: rpm-build <rpm-build>
|
|
|
bd4bcc |
Date: Tue, 2 May 2017 11:26:56 -0400
|
|
|
bd4bcc |
Subject: [PATCH] Revert "reldep_from_str: add support for rich deps"
|
|
|
bd4bcc |
|
|
|
bd4bcc |
This reverts commit 28017b4e2678f416f4a287da82382accd394d0d9.
|
|
|
bd4bcc |
---
|
|
|
bd4bcc |
libdnf/libdnf/hy-iutil.c | 27 ++++++++-------------------
|
|
|
bd4bcc |
1 file changed, 8 insertions(+), 19 deletions(-)
|
|
|
bd4bcc |
|
|
|
bd4bcc |
diff --git a/libdnf/libdnf/hy-iutil.c b/libdnf/libdnf/hy-iutil.c
|
|
|
bd4bcc |
index 4031a15..f5c14b5 100644
|
|
|
bd4bcc |
--- a/libdnf/libdnf/hy-iutil.c
|
|
|
bd4bcc |
+++ b/libdnf/libdnf/hy-iutil.c
|
|
|
bd4bcc |
@@ -40,7 +40,6 @@
|
|
|
bd4bcc |
#include <solv/solver.h>
|
|
|
bd4bcc |
#include <solv/solverdebug.h>
|
|
|
bd4bcc |
#include <solv/util.h>
|
|
|
bd4bcc |
-#include <solv/pool_parserpmrichdep.h>
|
|
|
bd4bcc |
|
|
|
bd4bcc |
// glib
|
|
|
bd4bcc |
#include <glib.h>
|
|
|
bd4bcc |
@@ -52,7 +51,6 @@
|
|
|
bd4bcc |
#include "hy-packageset-private.h"
|
|
|
bd4bcc |
#include "hy-query.h"
|
|
|
bd4bcc |
#include "dnf-sack-private.h"
|
|
|
bd4bcc |
-#include "dnf-reldep-private.h"
|
|
|
bd4bcc |
|
|
|
bd4bcc |
#define BUF_BLOCK 4096
|
|
|
bd4bcc |
#define CHKSUM_TYPE REPOKEY_TYPE_SHA256
|
|
|
bd4bcc |
@@ -734,23 +732,14 @@ parse_reldep_str(const char *reldep_str, char **name, char **evr,
|
|
|
bd4bcc |
DnfReldep *
|
|
|
bd4bcc |
reldep_from_str(DnfSack *sack, const char *reldep_str)
|
|
|
bd4bcc |
{
|
|
|
bd4bcc |
- if (reldep_str[0] == '(') {
|
|
|
bd4bcc |
- /* Rich dependency */
|
|
|
bd4bcc |
- Pool *pool = dnf_sack_get_pool (sack);
|
|
|
bd4bcc |
- Id id = pool_parserpmrichdep(pool, reldep_str);
|
|
|
bd4bcc |
- if (!id)
|
|
|
bd4bcc |
- return NULL;
|
|
|
bd4bcc |
- return dnf_reldep_from_pool (pool, id);
|
|
|
bd4bcc |
- } else {
|
|
|
bd4bcc |
- char *name, *evr = NULL;
|
|
|
bd4bcc |
- int cmp_type = 0;
|
|
|
bd4bcc |
- if (parse_reldep_str(reldep_str, &name, &evr, &cmp_type) == -1)
|
|
|
bd4bcc |
- return NULL;
|
|
|
bd4bcc |
- DnfReldep *reldep = dnf_reldep_new (sack, name, cmp_type, evr);
|
|
|
bd4bcc |
- g_free(name);
|
|
|
bd4bcc |
- g_free(evr);
|
|
|
bd4bcc |
- return reldep;
|
|
|
bd4bcc |
- }
|
|
|
bd4bcc |
+ char *name, *evr = NULL;
|
|
|
bd4bcc |
+ int cmp_type = 0;
|
|
|
bd4bcc |
+ if (parse_reldep_str(reldep_str, &name, &evr, &cmp_type) == -1)
|
|
|
bd4bcc |
+ return NULL;
|
|
|
bd4bcc |
+ DnfReldep *reldep = dnf_reldep_new (sack, name, cmp_type, evr);
|
|
|
bd4bcc |
+ g_free(name);
|
|
|
bd4bcc |
+ g_free(evr);
|
|
|
bd4bcc |
+ return reldep;
|
|
|
bd4bcc |
}
|
|
|
bd4bcc |
|
|
|
bd4bcc |
DnfReldepList *
|
|
|
bd4bcc |
--
|
|
|
bd4bcc |
2.12.2
|
|
|
bd4bcc |
|