diff options
| author | Thomas Jepp <tom@tomjepp.co.uk> | 2015-12-17 15:26:09 +0000 |
|---|---|---|
| committer | Thomas Jepp <tom@tomjepp.co.uk> | 2015-12-17 15:26:09 +0000 |
| commit | 8a2f140cdb863a757309500cf604108431076726 (patch) | |
| tree | c290e0a98ec26ed70e90bcc44668b8b4c5576051 | |
| parent | 97465a41a41d6458eb08fc2b635085d7db2367c4 (diff) | |
| download | vyatta-cfg-8a2f140cdb863a757309500cf604108431076726.tar.gz vyatta-cfg-8a2f140cdb863a757309500cf604108431076726.zip | |
Go back to using the apt version comparison for node sorting.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | src/cstore/cstore.cpp | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e74039e..e277a99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,7 @@ src_libvyatta_cfg_la_LIBADD += -lgio-2.0 src_libvyatta_cfg_la_LIBADD += -lgobject-2.0 src_libvyatta_cfg_la_LIBADD += -lboost_system src_libvyatta_cfg_la_LIBADD += -lboost_filesystem +src_libvyatta_cfg_la_LIBADD += -lapt-pkg src_libvyatta_cfg_la_LIBADD += -lperl src_libvyatta_cfg_la_LDFLAGS = -version-info 1:0:0 src_libvyatta_cfg_la_SOURCES = src/cli_parse.y src/cli_def.l src/cli_val.l diff --git a/debian/control b/debian/control index cb31dbc..23c5a8c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: contrib/net Priority: extra Maintainer: VyOS Package Maintainers <maintainers@vyos.net> Build-Depends: debhelper (>= 5), autotools-dev, libglib2.0-dev, - libboost-filesystem1.55-dev, libtool, flex, + libboost-filesystem1.55-dev, libapt-pkg-dev, libtool, flex, bison, libperl-dev, autoconf, automake, pkg-config, cpio Standards-Version: 3.9.1 @@ -21,6 +21,7 @@ Depends: sed (>= 4.1.5), unionfs-fuse, libboost-filesystem1.55.0, vyatta-quagga, + libapt-pkg4.12, ${perl:Depends}, ${shlibs:Depends} Suggests: util-linux (>= 2.13-5), net-tools, diff --git a/src/cstore/cstore.cpp b/src/cstore/cstore.cpp index 85acbca..1253978 100644 --- a/src/cstore/cstore.cpp +++ b/src/cstore/cstore.cpp @@ -25,6 +25,9 @@ #include <sstream> #include <memory> +#include <apt-pkg/version.h> +#include <apt-pkg/debversion.h> + #include <cli_cstore.h> #include <cstore/cstore.hpp> #include <cstore/unionfs/cstore-unionfs.hpp> @@ -2019,7 +2022,7 @@ Cstore::assert_internal(bool cond, const char *fmt, ...) bool Cstore::sort_func_deb_version(string a, string b) { - return strcmp(a.c_str(), b.c_str()) > 0; + return debVS.CmpVersion(a, b) > 0; } void |