Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 21c526de2fc6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b5163bc937de
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 7, 2017

  1. Copy the full SHA
    5bc38fc View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2017

  1. glusterfs: Fix wrong xattr package: xattr -> pyxattr.

    Fixes error
    
      File "/nix/store/lxpsl84km87xpk59nai6a33ihgpfs7qr-glusterfs-3.10.2/libexec/glusterfs/glusterfind/changelog.py", line 105, in populate_pgfid_and_inodegfid
          file_xattrs = xattr.list(p)
      AttributeError: 'module' object has no attribute 'list'
    
    when using `glusterfind pre`.
    nh2 committed Sep 8, 2017
    Copy the full SHA
    8e329da View commit details
    Browse the repository at this point in the history
  2. glusterfs: Patch upstream bug preventing glusterfind from running.

    See: https://bugzilla.redhat.com/show_bug.cgi?id=1489610
    
    Also add patch to correctly log stderr from remote nodes
    when glusterfind fails.
    This, too, should be removed when fixed upstream.
    nh2 committed Sep 8, 2017
    Copy the full SHA
    e7325f8 View commit details
    Browse the repository at this point in the history
  3. glusterfs: Fix glusterfind's crawlers dlopen() error.

    This fixes:
    
      Traceback (most recent call last):
        File "/nix/store/7f9arl3f9xyj8sm05mkanh2mlp217192-glusterfs-3.10.2/libexec/glusterfs/glusterfind/changelog.py", line 22, in <module>
          import libgfchangelog
        File "/nix/store/7f9arl3f9xyj8sm05mkanh2mlp217192-glusterfs-3.10.2/libexec/glusterfs/glusterfind/libgfchangelog.py", line 21, in <module>
          libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL)
        File "/nix/store/nlyr5ankhi7yvva8zndi718zj37js270-python-2.7.13-env/lib/python2.7/ctypes/__init__.py", line 362, in __init__
          self._handle = _dlopen(self._name, mode)
      OSError: libgfchangelog.so: cannot open shared object file: No such file or directory
      Connection to 10.0.0.2 closed.
    
    when running `glusterfind pre`.
    
    Done by setting PYTHONPATH/LD_LIBRARY_PATH as for the other
    Python scripts.
    nh2 committed Sep 8, 2017
    Copy the full SHA
    abc96aa View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2017

  1. Merge pull request #29071 from nh2/glusterfs-glusterfind-dirs

    glusterfs service: Ensure dirs needed by `glusterfind` exist
    joachifm committed Sep 9, 2017
    Copy the full SHA
    b5163bc View commit details
    Browse the repository at this point in the history