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.

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

adapt schema files #598

Merged
merged 7 commits into from
May 6, 2020
Merged

adapt schema files #598

merged 7 commits into from
May 6, 2020

Conversation

jreidinger
Copy link
Member

No description provided.

@coveralls
Copy link

coveralls commented May 4, 2020

Coverage Status

Coverage remained the same at 23.679% when pulling ef4d883 on improve_schema into 7e29861 on master.

Copy link
Contributor

@imobachgs imobachgs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless I have overlooked something, it looks good to me.

@mvidner
Copy link
Member

mvidner commented May 4, 2020

PR description missing

@@ -23,6 +31,9 @@ SYMBOL =
LIST =
attribute config:type { "list" }

MAP =
attribute config:type { "map" }?

# this is useful for testing
Anything =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW the * aka <anyName/> that this uses would crash REXML RelaxNG if used. But it does not implement include either so it

a. won't crash
b. won't be able to use the AY schema

I will make a REXML issue/PR about this.

file_path = element file_path { STRING }
file_permissions = element file_permissions { STRING }
file_owner = element file_owner { STRING }
file_script = element file_script { MAP, (interpreter & source? & element location { STRING }? ) }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

multiple lines please

Also, interpreter and source are from scripts.rnc, we may want to clean up these dependencies

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well, I do not do any reformatting just, fixes.

src/autoyast-rnc/common.rnc Outdated Show resolved Hide resolved

subvolumes = element subvolumes {
LIST,
subvolume*
}

# by default, AutoYaST exports list entries as 'listentry'
# TODO: it can be configured to export it as subvolume, maybe do it?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is comment for that default export as listentry...We found on IRC that it is already fixed and we export it as subvolume already. I will remove it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, remove please

Co-authored-by: Martin Vidner <mvidner@suse.cz>
package/autoyast2.changes Outdated Show resolved Hide resolved
Co-authored-by: Martin Vidner <mvidner@suse.cz>
@jreidinger jreidinger marked this pull request as ready for review May 6, 2020 15:12
@jreidinger jreidinger merged commit 05cd912 into master May 6, 2020
@jreidinger jreidinger deleted the improve_schema branch May 6, 2020 15:30
@yast-bot
Copy link
Contributor

yast-bot commented May 6, 2020

✔️ Public Jenkins job #73 successfully finished
✔️ Created OBS submit request #800790

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants