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

trash-cli: 0.12.9.14 -> 0.17.1.14 #23421

Closed
wants to merge 1 commit into from
Closed

trash-cli: 0.12.9.14 -> 0.17.1.14 #23421

wants to merge 1 commit into from

Conversation

ndowens
Copy link
Contributor

@ndowens ndowens commented Mar 3, 2017

Motivation for this change

Update, patches are no longer needed; Seems to work fine. Tested trash-put test-file and trash-empty and worked fine

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@ndowens, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rycee, @domenkozar and @FRidh to be potential reviewers.

@rycee
Copy link
Member

rycee commented Mar 3, 2017

Thanks for the PR! Unfortunately, at least the paths in list_mount_points.py still need to be patched:

$ ./result/bin/trash-list 
Traceback (most recent call last):
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/bin/.trash-list-wrapped", line 6, in <module>
    sys.exit(main())
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/lib/python3.5/site-packages/trashcli/cmds.py", line 51, in list
    ).run(*sys.argv)
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/lib/python3.5/site-packages/trashcli/list.py", line 37, in run
    parse(argv)
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/lib/python3.5/site-packages/trashcli/trash.py", line 110, in __call__
    self.default_action()
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/lib/python3.5/site-packages/trashcli/list.py", line 51, in list_trash
    trashdirs.list_trashdirs()
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/lib/python3.5/site-packages/trashcli/trash.py", line 151, in list_trashdirs
    self._for_each_volume_trashcan()
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/lib/python3.5/site-packages/trashcli/trash.py", line 157, in _for_each_volume_trashcan
    for volume in self.mount_points():
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/lib/python3.5/site-packages/trashcli/list_mount_points.py", line 5, in mount_points
    return list(mount_points_from_getmnt())
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/lib/python3.5/site-packages/trashcli/list_mount_points.py", line 10, in mount_points_from_getmnt
    for elem in _mounted_filesystems_from_getmnt():
  File "/nix/store/klc595vf3zg3prd68814dxscis3ii5f1-trash-cli-0.17.1.14/lib/python3.5/site-packages/trashcli/list_mount_points.py", line 57, in _mounted_filesystems_from_getmnt
    libc = cdll.LoadLibrary(libc_name)
  File "/nix/store/wkl9lz79bdq503b3a22hpjblxj61r081-python3-3.5.3/lib/python3.5/ctypes/__init__.py", line 425, in LoadLibrary
    return self._dlltype(name)
  File "/nix/store/wkl9lz79bdq503b3a22hpjblxj61r081-python3-3.5.3/lib/python3.5/ctypes/__init__.py", line 347, in __init__
    self._handle = _dlopen(self._name, mode)
OSError: /lib/libc.so.6: cannot open shared object file: No such file or directory

@rycee
Copy link
Member

rycee commented Mar 3, 2017

I modified your commit to reintroduce the path fixing patch. The updated trash-cli is now rebased into master in 477014f.

@rycee rycee closed this Mar 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: package (update)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ndowens @mention-bot @rycee @joachifm