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

970777 - the new importer no longer looks for the non-existant CLI optio... #221

Merged
merged 1 commit into from Jun 6, 2013
Merged

970777 - the new importer no longer looks for the non-existant CLI optio... #221

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions plugins/pulp_rpm/plugins/importers/yum/associate.py
View file
Open in desktop
Expand Up @@ -49,9 +49,6 @@ def associate(source_repo, dest_repo, import_conduit, config, units=None):
units = import_conduit.get_source_units()

# get config items that we care about
copy_children = config.get_boolean(constants.CONFIG_COPY_CHILDREN)
if copy_children is None:
copy_children = True
recursive = config.get(constants.CONFIG_RECURSIVE)
if recursive is None:
recursive = False
Expand All @@ -64,7 +61,7 @@ def associate(source_repo, dest_repo, import_conduit, config, units=None):
import_conduit, recursive)

# return here if we shouldn't get child units
if not copy_children:
if not recursive:
return associated_units

group_ids, rpm_names, rpm_unit_keys = identify_children_to_copy(associated_units)
Expand Down
3 changes: 0 additions & 3 deletions pulp_rpm/src/pulp_rpm/common/constants.py
View file
Open in desktop
Expand Up @@ -33,9 +33,6 @@

PUBLISHED_DISTRIBUTION_FILES_KEY = 'published_distributions'

# Importer configuration key names
CONFIG_COPY_CHILDREN = 'copy_children'

# The default number of threads to be used with downloading ISOs. We should convert the RPM code to
# use this same value.
CONFIG_MAX_DOWNLOADS_DEFAULT = 5
Expand Down