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

Jump to bottom

i3lock-fancy: Bugfix, make scrot overwrite file #67825

Merged
merged 1 commit into from Sep 5, 2019
Merged

i3lock-fancy: Bugfix, make scrot overwrite file #67825

merged 1 commit into from Sep 5, 2019

Conversation

Enteee
Copy link
Contributor

@Enteee Enteee commented Aug 31, 2019 •
edited

Motivation for this change

After commit resurrecting-open-source-projects/scrot@489e322 scrot will no longer overwrite files unless the -o option is given. This commit makes the i3lock-fancy use scrot -z -o instead of just scrot -z.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @garbas , @vcunat , @NeQuissimus , @rail , @jokogr

@Enteee
i3lock-fancy: Bugfix, make scrot overwrite file
8a4ad54 
After commit [1] scrot will no longer overwrite files unless the `-o`
option is given. This commit makes the i3lock-fancy use `scrot -z -o`
instead of just `scrot -o`.

[1]: resurrecting-open-source-projects/scrot@489e322
NeQuissimus
NeQuissimus approved these changes Aug 31, 2019
View reviewed changes
Copy link
Member

@NeQuissimus NeQuissimus left a comment

Choose a reason for hiding this comment

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

Thank you, I actually encountered this the other day

@Enteee
Copy link
Contributor Author

Enteee commented Aug 31, 2019

just noticed a mistake in the commit message, i won't rebase & force push in order to preserve the reviewer state but whoever merges this probably wants to fix:

... This commit makes the i3lock-fancy use scrot -z -o instead of just scrot -o.

to

... This commit makes the i3lock-fancy use scrot -z -o instead of just scrot -z.

@Enteee
Copy link
Contributor Author

Enteee commented Aug 31, 2019

@NeQuissimus you are welcome. Yes this bug is somewhat annoying since screen locking is now broken on my machine :)

@Enteee
Copy link
Contributor Author

Enteee commented Sep 5, 2019

@NeQuissimus what else can I do so that this PR gets merged?
Not having a lock screen is quite annoying :)

@NeQuissimus NeQuissimus merged commit b081115 into NixOS:master Sep 5, 2019
@NeQuissimus
Copy link
Member

My bad, I had wanted to try it out first.

@Enteee
Copy link
Contributor Author

Enteee commented Sep 6, 2019

yay, thank you for merging this. @NeQuissimus

@Enteee Enteee deleted the bugfix/i3lock-fancy branch September 6, 2019 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NeQuissimus NeQuissimus NeQuissimus approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Enteee @NeQuissimus