From ab5d113435bbc745b7195933d22d1a08096ed195 Mon Sep 17 00:00:00 2001 From: Jiri Kyjovsky Date: Mon, 24 Apr 2023 17:17:59 +0200 Subject: [PATCH] dist-git: allow importing pre-generated srpm in rpkg Related: https://github.com/fedora-copr/copr/issues/2317 pyrpkg don't allow using pre-generated SRPM by default. They created for this `allow_pre_generated_srpm` for us. --- dist-git/copr_dist_git/package_import.py | 3 ++- dist-git/tests/test_crazy_merging.py | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dist-git/copr_dist_git/package_import.py b/dist-git/copr_dist_git/package_import.py index d81197a96..fb600aae3 100644 --- a/dist-git/copr_dist_git/package_import.py +++ b/dist-git/copr_dist_git/package_import.py @@ -158,7 +158,8 @@ def _load_commands(opts, repo_name, repo_dir): anongiturl="", branchre="", kojiprofile="", - build_client="") + build_client="", + allow_pre_generated_srpm=True) # rpkg gets module_name as a basename of git url # we use module_name as "username/projectname/package_name" diff --git a/dist-git/tests/test_crazy_merging.py b/dist-git/tests/test_crazy_merging.py index 48575ae85..d0dbbc947 100644 --- a/dist-git/tests/test_crazy_merging.py +++ b/dist-git/tests/test_crazy_merging.py @@ -6,7 +6,6 @@ import shutil import time import os -import logging from munch import Munch from subprocess import check_output @@ -230,7 +229,6 @@ def test_diverge_middle_branches(self, initial_commit_everywhere, mc_setup_git_r assert v3_hash_a != v1_hash assert v3_hash_b != v1_hash - @pytest.mark.skip(reason="Remove the skip once python-rpkg resolves issue #677") def test_no_op_1(self, initial_commit_everywhere, mc_setup_git_repo): branches, opts, v1_hash = initial_commit_everywhere origin, all_branches, middle_branches, border_branches = branches