Drop NETPLAN_VERSION not in spec for feature flags

canonical · Aug 20, 2019 · 9ea105b · 9ea105b
1 parent 2f282a0
commit 9ea105b
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,6 @@
-NETPLAN_VERSION=2.98.1
-
 BUILDFLAGS = \
 	-std=c99 \
 	-D_XOPEN_SOURCE=500 \
-	-DNETPLAN_VERSION='"$(NETPLAN_VERSION)"' \
 	-DSBINDIR=\"$(SBINDIR)\" \
 	-Wall \
 	-Werror \
@@ -45,7 +42,6 @@ src/_features.h: src/[^_]*.[hc]
 
 netplan/_features.py: src/[^_]*.[hc]
 	echo "# Generated file" > $@
-	echo "NETPLAN_VERSION = \"$(NETPLAN_VERSION)\"" >> $@
 	echo "NETPLAN_FEATURE_FLAGS = [" >> $@
 	awk 'match ($$0, /netplan-feature:.*/ ) { $$0=substr($$0, RSTART, RLENGTH); print "    \""$$2"\"," }' $^ >> $@
 	echo "]" >> $@

diff --git a/netplan/cli/commands/info.py b/netplan/cli/commands/info.py
@@ -45,7 +45,6 @@ def command_info(self):
 
         netplan_version = {
             'netplan.io': {
-                'version': netplan._features.NETPLAN_VERSION,
                 'website': 'https://netplan.io/',
             }
         }

diff --git a/src/dbus.c b/src/dbus.c
@@ -58,10 +58,6 @@ static int method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_erro
     if (exit_status < 0)
        return exit_status;
 
-    exit_status = sd_bus_message_append(reply, "(sv)", "Version", "s", NETPLAN_VERSION);
-    if (exit_status < 0)
-       return exit_status;
-
     exit_status = sd_bus_message_open_container(reply, 'r', "sv");
     if (exit_status < 0)
        return exit_status;