From 411d99b7f65e7e1e9eefd8e5a9cca0816556c2c6 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Feb 08 2018 14:23:50 +0000 Subject: Remove epel condition, fix everythin --- diff --git a/fix_requires.py b/fix_requires.py index 4146485..4f28171 100755 --- a/fix_requires.py +++ b/fix_requires.py @@ -155,15 +155,6 @@ def main(packages, dirname, no_mock_build, no_koji_build, pagure, package_name, pagure_token, pagure_user, logger) local_repo.clone() - # Check if the package has EPEL branches. And skip those in the - # first batches, then create some clever scheme to handle them. - if local_repo.has_epel_branch(): - logger.info( - f'The package {package_name} seems to be built for Fedora ' - 'and EPEL. Skipping for now as the spec file may be shared.') - non_fedora_packages.append(package_name) - continue - local_repo.create_branch(GIT_BRANCH) spec_fixed = fix_specfile(local_repo.specfile, modifier) @@ -198,11 +189,11 @@ def main(packages, dirname, no_mock_build, no_koji_build, pagure, if pagure: # Use username as a name for fork remote if not provided. remote_name = pagure_user + local_repo.add_to_git_remotes(remote_name, fork_url) local_repo.git_add(local_repo.specfile) local_repo.git_commit(COMMIT) local_repo.git_push(remote_name, GIT_BRANCH) - # If the PR is already there, then the script is being run # the second time, and just pushing to a fork is enough. pr = pagure_fork.has_upstream_pr_with(