|
|
@ -1,4 +1,4 @@
|
|
|
|
From 6b5c116b0369a0a6c6ecb40c8bcc0974a36fa714 Mon Sep 17 00:00:00 2001
|
|
|
|
From 129d556d19d2e41135f5e98ed028d7d00e66b524 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
|
|
|
|
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
|
|
|
|
Date: Tue, 30 Oct 2018 20:37:38 +0100
|
|
|
|
Date: Tue, 30 Oct 2018 20:37:38 +0100
|
|
|
|
Subject: [PATCH 8/8] add support for dependencies with same name
|
|
|
|
Subject: [PATCH 8/8] add support for dependencies with same name
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
|
|
|
|
1 file changed, 20 insertions(+), 12 deletions(-)
|
|
|
|
1 file changed, 20 insertions(+), 12 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/rust2rpm/metadata.py b/rust2rpm/metadata.py
|
|
|
|
diff --git a/rust2rpm/metadata.py b/rust2rpm/metadata.py
|
|
|
|
index 119dea5..10c0011 100644
|
|
|
|
index 119dea5..febf1e5 100644
|
|
|
|
--- a/rust2rpm/metadata.py
|
|
|
|
--- a/rust2rpm/metadata.py
|
|
|
|
+++ b/rust2rpm/metadata.py
|
|
|
|
+++ b/rust2rpm/metadata.py
|
|
|
|
@@ -1,5 +1,6 @@
|
|
|
|
@@ -1,5 +1,6 @@
|
|
|
@ -57,7 +57,7 @@ index 119dea5..10c0011 100644
|
|
|
|
- deps_by_feature[dep.name] = ({None}, {copy.deepcopy(dep)})
|
|
|
|
- deps_by_feature[dep.name] = ({None}, {copy.deepcopy(dep)})
|
|
|
|
- else:
|
|
|
|
- else:
|
|
|
|
- mandatory_deps.add(copy.deepcopy(dep))
|
|
|
|
- mandatory_deps.add(copy.deepcopy(dep))
|
|
|
|
+ for deps in deps_by_name.values():
|
|
|
|
+ for name, deps in deps_by_name.items():
|
|
|
|
+ fdeps = set()
|
|
|
|
+ fdeps = set()
|
|
|
|
+ for dep in deps:
|
|
|
|
+ for dep in deps:
|
|
|
|
+ if dep.optional:
|
|
|
|
+ if dep.optional:
|
|
|
|