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

Use correct keyboard file #204

Merged
merged 3 commits into from
Feb 28, 2019
Merged

Use correct keyboard file #204

merged 3 commits into from
Feb 28, 2019

Conversation

joseivanlopez
Copy link
Contributor

@joseivanlopez joseivanlopez commented Feb 27, 2019 •
edited
Loading

Problem

There are two keyboards' "databases"

  • keyboard_raw.ycp (the SLE file)
  • keyboard_raw_opensuse.ycp (the openSUSE file)

And there are two problems with them

  1. keyboard_raw.rb (the SLE file) contains lt.baltic.map.gz, which seems to be incompatible with the current consolefonts.

  2. the code trusts to find opensuse as value in the ID key of /etc/os-release for openSUSE. However, what is found there is:

  • opensuse-tumbleweed in openSUSE TW
  • opensuse-leap in openSUSE Leap

Related links:

Solution

  • Fix OS detection.
  • In opensuse file, use lt.map.gz (as SLE file does) instead of incompatible lt.baltic.map.gz.

Testing

  • Adapted unit tests
  • Tested manually

@joseivanlopez joseivanlopez marked this pull request as ready for review February 28, 2019 09:28
dgdavid
dgdavid approved these changes Feb 28, 2019
View reviewed changes
Copy link
Member

@dgdavid dgdavid left a comment

Choose a reason for hiding this comment

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

👍

@joseivanlopez joseivanlopez merged commit 2a3fb6e into yast:master Feb 28, 2019
@yast-bot
Copy link
Contributor

✔️ Public Jenkins job #15 successfully finished
✔️ Created OBS submit request #680111

@yast-bot
Copy link
Contributor

✔️ Internal Jenkins job #15 successfully finished
✔️ Created IBS submit request #185810

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgdavid dgdavid dgdavid approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@joseivanlopez @yast-bot @dgdavid