zkfuse: remove applied patch
This commit is contained in:
parent
3d104ab2b3
commit
5dde5ded09
|
@ -1,7 +1,8 @@
|
|||
{ stdenv, fetchurl, jre, makeWrapper, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zookeeper-3.4.9";
|
||||
name = "zookeeper-${version}";
|
||||
version = "3.4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
|
||||
|
|
|
@ -1,15 +1,10 @@
|
|||
{ stdenv, lib, zookeeper, zookeeper_mt, fuse, pkgconfig, autoreconfHook, log4cxx, boost, tree }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zkfuse";
|
||||
name = "zkfuse-${version}";
|
||||
inherit (zookeeper) version src;
|
||||
|
||||
src = zookeeper.src;
|
||||
patches = [
|
||||
# see: https://issues.apache.org/jira/browse/ZOOKEEPER-1929
|
||||
./zookeeper-1929.patch
|
||||
];
|
||||
|
||||
setSourceRoot = "export sourceRoot=${zookeeper.name}/src/contrib/zkfuse";
|
||||
sourceRoot = "${zookeeper.name}/src/contrib/zkfuse";
|
||||
|
||||
buildInputs = [ autoreconfHook zookeeper_mt log4cxx boost fuse ];
|
||||
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/src/contrib/zkfuse/src/zkadapter.cc b/src/contrib/zkfuse/src/zkadapter.cc
|
||||
index 886051d..93dbef5 100644
|
||||
--- a/src/zkadapter.cc
|
||||
+++ b/src/zkadapter.cc
|
||||
@@ -845,7 +845,10 @@ ZooKeeperAdapter::getNodeData(const string &path,
|
||||
string("Unable to get data of node ") + path, rc
|
||||
);
|
||||
} else {
|
||||
- return string( buffer, buffer + len );
|
||||
+ if (len == -1) {
|
||||
+ len = 0;
|
||||
+ };
|
||||
+ return string( buffer, len );
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue