Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Combiner] Add option to skip version mismatch #9

Merged
merged 1 commit into from
Jul 25, 2018
Merged

[Combiner] Add option to skip version mismatch #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions combirepo/commandline_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ def __register_special_options(self):
"\\fInon-marked\\fR repository. Useful for massive builds: "
"LTO enabling for whole project, massive sanitizing, compiler "
"options experiments.")
self._parser.add_argument(
"--skip-version-mismatch", action="store_true", default=False,
dest="skip_mismatch", help="If true and there is version mismatch, "
"unmark such packages and continue build. Else go to exception in"
"such case.")
self._parser.add_argument(
"-P", "--preferring-strategy", action="store", type=str,
dest="preferring_strategy", help="Have choice resolving strategy "
Expand Down Expand Up @@ -403,6 +408,7 @@ def parse(self):

parameters.greedy_mode = arguments.greedy
parameters.mirror_mode = arguments.mirror
parameters.skip_mismatch = arguments.skip_mismatch
if arguments.preferring_strategy is not None:
parameters.preferring_strategy = arguments.preferring_strategy
if arguments.sup_repo_url is not None:
Expand Down
14 changes: 8 additions & 6 deletions combirepo/repository_combiner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def build_package_set(graph, back_graph, package_names):
return marked


def check_rpm_versions(graph, marked_graph, packages):
def check_rpm_versions(graph, marked_graph, packages, if_skip_mismatch = False):
"""
Checks that versions of packages do not differ, otherwise reports about
all differencies and aborts the program.
Expand Down Expand Up @@ -153,8 +153,9 @@ def check_rpm_versions(graph, marked_graph, packages):
"".format(package=package, len_package=len_package_name_max,
version=version, version_marked=version_marked,
len_version=len_version_max))
logging.error("Please go and rebuild them!")
sys.exit("Error.")
if not if_skip_mismatch:
logging.error("Please go and rebuild them!")
sys.exit("Error.")


def get_requirements_updates(package_name, requirements_tuples,
Expand Down Expand Up @@ -211,7 +212,7 @@ def get_requirements_updates(package_name, requirements_tuples,


def construct_combined_repository(graph, marked_graph, marked_packages,
if_mirror, rpm_patcher):
if_mirror, rpm_patcher, if_skip_mismatch = False):
"""
Constructs the temporary repository that consists of symbolic links to
packages from non-marked and marked repositories.
Expand All @@ -225,7 +226,7 @@ def construct_combined_repository(graph, marked_graph, marked_packages,

@return The path to the constructed combined repository.
"""
check_rpm_versions(graph, marked_graph, marked_packages)
check_rpm_versions(graph, marked_graph, marked_packages, if_skip_mismatch)
repository_path = temporaries.create_temporary_directory("combirepo")
packages_not_found = []
copy_tasks = []
Expand Down Expand Up @@ -434,7 +435,8 @@ def process_repository_pair(repository_pair, graphs, parameters,
marked_graph,
marked_packages,
mirror_mode,
rpm_patcher)
rpm_patcher,
parameters.skip_mismatch)
return combined_repository_path, marked_packages


Expand Down