8000 fix/windows by tpw56j · Pull Request #2767 · cobbler/cobbler · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix/windows #2767

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
Merged
merged 1 commit into from
Aug 30, 2021
Merged

fix/windows #2767

merged 1 commit into from
Aug 30, 2021

Conversation

tpw56j
Copy link
Contributor
@tpw56j tpw56j commented Aug 29, 2021
  • the lack of mandatory attributes for windows distros in distro_signatures.json breaks the cobbler import, even if the import is not done for windows distro.
  • added support for import windows distros. It simplifies the preparation of installation and eliminates the need to do part of the preparation on windows.
  • fixed some small bugs.

Copy link
codecov bot commented Aug 29, 2021 •
edited
Loading

Codecov Report

Merging #2767 (4320f1e) into master (415f140) will increase coverage by 1.31%.
The diff coverage is 10.71%.

❗ Current head 4320f1e differs from pull request most recent head 45920fa. Consider uploading reports for the commit 45920fa to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2767      +/-   ##
==========================================
+ Coverage   41.80%   43.12%   +1.31%     
==========================================
  Files          86       97      +11     
  Lines       13524    14078     +554     
==========================================
+ Hits         5654     6071     +417     
- Misses       7870     8007     +137
Impacted Files Coverage Δ
cobbler/modules/sync_post_wingen.py 9.96% <0.00%> (-0.09%) ⬇️
cobbler/modules/managers/import_signatures.py 10.87% <6.66%> (-0.40%) ⬇️
cobbler/utils.py 70.39% <100.00%> (-0.11%) ⬇️
cobbler/cli.py 64.38% <0.00%> (ø)
cobbler/remote.py 0.00% <0.00%> (ø)
cobbler/module_loader.py 85.89% <0.00%> (ø)
cobbler/settings.py
cobbler/settings/migrations/V3_1_0.py 80.00% <0.00%> (ø)
cobbler/settings/__init__.py 85.11% <0.00%> (ø)
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 415f140...45920fa. Read the comment docs.

@SchoolGuy
Copy link
Member

@tpw56j Could you try to fix the lazy formatting for the logger and the line-to-long before we merge this please?

@SchoolGuy SchoolGuy added this to the v3.3.0 milestone Aug 30, 2021
@SchoolGuy SchoolGuy self-assigned this Aug 30, 2021
@SchoolGuy SchoolGuy requested review from SchoolGuy and nodeg August 30, 2021 06:54
@SchoolGuy
Copy link
Member

@tpw56j I took the liberty of fixing it quickly and squashing.

SchoolGuy
SchoolGuy approved these changes Aug 30, 2021
View reviewed changes
Copy link
Member
@SchoolGuy SchoolGuy left a comment

Choose a reason for hiding this comment

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

LGTM

@tpw56j
Copy link
Contributor Author
tpw56j commented Aug 30, 2021

@SchoolGuy I tried to merge your changes into my local branch, but I'm not sure if the result is correct.

@SchoolGuy
Copy link
Member

@tpw56j You don't need to merge anything. In this case a git reset --hard <REMOTE BRANCH> would have been the correct behavior. I will force push my stuff again so we have the correct state again.

@SchoolGuy
Copy link
Member

So the branch is now in the exact state it needs to be in.

@tpw56j
8000 Copy link
Contributor Author
tpw56j commented Aug 30, 2021

@SchoolGuy My branch in the local repository is also in the correct state. Thanks!

$ git status
On branch fix/windows
Your branch is up to date with 'origin/fix/windows'.

nothing to commit, working tree clean

@SchoolGuy
Copy link
Member

@tpw56j I will wait for @nodeg 's okay. If he is happy we merge this!

nodeg
nodeg approved these changes Aug 30, 2021
View reviewed changes
Copy link
Member
@nodeg nodeg left a comment

Choose a reason for hiding this comment

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

I have not tested this but the changes look reasonable.

@SchoolGuy SchoolGuy merged commit 5728f53 into cobbler:master Aug 30, 2021
@hveini hveini mentioned this pull request Oct 10, 2021
Closed
@SchoolGuy SchoolGuy mentioned this pull request Nov 30, 2022
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nodeg nodeg nodeg approved these changes

@SchoolGuy SchoolGuy SchoolGuy approved these changes

Assignees

@SchoolGuy SchoolGuy

Labels
None yet
Projects
None yet
Milestone
v3.3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@tpw56j @SchoolGuy @nodeg
0