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

Update uses of product values from anaconda #251

Open
wants to merge 1 commit into
base: rawhide
Choose a base branch
from
Open

Update uses of product values from anaconda #251

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
10 changes: 6 additions & 4 deletions org_fedora_oscap/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
from pyanaconda.core import constants
from pyanaconda.core.dbus import DBus
from pyanaconda.core.constants import PAYLOAD_TYPE_DNF
from pyanaconda.core.product import get_product_short_name, get_product_version
from pyanaconda.modules.common.constants.namespaces import ADDONS_NAMESPACE
from pyanaconda.modules.common.constants.services import NETWORK, PAYLOADS
from pyanaconda.modules.common.structures.packages import PackagesSelectionData
Expand Down Expand Up @@ -85,16 +86,17 @@ def N_(string): return string
# Enable patches that set the content name at package-time
DEFAULT_SSG_CONTENT_NAME = ""
SSG_CONTENT = DEFAULT_SSG_CONTENT_NAME
SHORT_PRODUCT_NAME = get_product_short_name()
if not SSG_CONTENT:
if constants.shortProductName != 'anaconda':
if constants.shortProductName == 'fedora':
if SHORT_PRODUCT_NAME != 'anaconda':
if SHORT_PRODUCT_NAME == 'fedora':
SSG_CONTENT = "ssg-fedora-ds.xml"
else:
SSG_CONTENT = (
"ssg-{name}{version}-ds.xml"
.format(
name=constants.shortProductName,
version=constants.productVersion.strip(".")[0]))
name=SHORT_PRODUCT_NAME,
version=get_product_version().strip(".")[0]))

RESULTS_PATH = utils.join_paths(TARGET_CONTENT_DIR,
"eval_remediate_results.xml")
Expand Down