1
0
Fork
You've already forked pyparted
1

Ubuntu fixes #86

Open
iawells wants to merge 4 commits from iawells/ubuntu-fixes into main
pull from: iawells/ubuntu-fixes
merge into: dcantrell:main
dcantrell:main
dcantrell:stable-3.9.x
dcantrell:master-distutils
dcantrell:master-staging
dcantrell:test-cases
iawells commented 2022年01月20日 20:14:20 +01:00 (Migrated from github.com)
Copy link

Not so much 'fixes for Ubuntu' as 'fixes I found I needed when I tried to compile on Ubuntu'.

Nothing here changes behaviour, though one change is a change to the precise test being run (it makes a 1.4M FS rather than a 140k FS, which doesn't change the test's intent).

Not so much 'fixes for Ubuntu' as 'fixes I found I needed when I tried to compile on Ubuntu'. Nothing here changes behaviour, though one change is a change to the precise test being run (it makes a 1.4M FS rather than a 140k FS, which doesn't change the test's intent).
VladimirSlavik (Migrated from github.com) reviewed 2022年01月21日 10:54:38 +01:00
VladimirSlavik (Migrated from github.com) commented 2022年01月21日 10:54:37 +01:00
Copy link

You have the same change twice, once here, once earlier in the file, and they are in two commits. Does this one perhaps belong to the next commit instead?

You have the same change twice, once here, once earlier in the file, and they are in two commits. Does this one perhaps belong to the next commit instead?
iawells (Migrated from github.com) reviewed 2022年02月01日 07:28:18 +01:00
iawells (Migrated from github.com) commented 2022年02月01日 07:28:18 +01:00
Copy link

It does indeed.

It does indeed.
dcantrell commented 2022年02月28日 20:51:34 +01:00 (Migrated from github.com)
Copy link

I am waiting on feedback for the review comments I left. If you can clean up the things I mentioned, I can merge this.

I am waiting on feedback for the review comments I left. If you can clean up the things I mentioned, I can merge this.
First-time contributor
Copy link

@iawells @dcantrell - is the feedback added and this can be merged? I hit errors when trying to use on Ubuntu 22.04

@iawells @dcantrell - is the feedback added and this can be merged? I hit errors when trying to use on Ubuntu 22.04
dcantrell (Migrated from github.com) approved these changes 2025年01月17日 20:03:51 +01:00
dcantrell (Migrated from github.com) commented 2022年01月26日 18:04:56 +01:00
Copy link

Won't the assert() here not work if pyparted is byte-compiled with optimizations? From the documentation: "... The current code generator emits no code for an assert statement when optimization is requested at compile time. ...". Similar to assert() in C.

If that's the case, save the return value of os.system() and then use that variable inside the assert(). But if os.system() here errored, shouldn't there be a sys.exit() instead so it handles the optimized byte-compiled case as well?

The above applies to the rest of the assert() usage as well.

Won't the assert() here not work if pyparted is byte-compiled with optimizations? From the documentation: "... The current code generator emits no code for an assert statement when optimization is requested at compile time. ...". Similar to assert() in C. If that's the case, save the return value of os.system() and then use that variable inside the assert(). But if os.system() here errored, shouldn't there be a sys.exit() instead so it handles the optimized byte-compiled case as well? The above applies to the rest of the assert() usage as well.
dcantrell commented 2025年01月17日 20:05:23 +01:00 (Migrated from github.com)
Copy link

@iawells Please resolve these merge conflicts so I can take this PR. Thanks!

@iawells Please resolve these merge conflicts so I can take this PR. Thanks!
This pull request has changes conflicting with the target branch.
  • src/pyconstraint.c
  • src/pydevice.c
  • src/pydisk.c
  • src/pyfilesys.c
  • src/pygeom.c
  • src/pytimer.c
  • tests/baseclass.py
  • tests/test__ped_device.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin iawells/ubuntu-fixes:iawells/ubuntu-fixes
git switch iawells/ubuntu-fixes

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff iawells/ubuntu-fixes
git switch iawells/ubuntu-fixes
git rebase main
git switch main
git merge --ff-only iawells/ubuntu-fixes
git switch iawells/ubuntu-fixes
git rebase main
git switch main
git merge --no-ff iawells/ubuntu-fixes
git switch main
git merge --squash iawells/ubuntu-fixes
git switch main
git merge --ff-only iawells/ubuntu-fixes
git switch main
git merge iawells/ubuntu-fixes
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
dcantrell/pyparted!86
Reference in a new issue
dcantrell/pyparted
No description provided.
Delete branch "iawells/ubuntu-fixes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?