From 286d6864633f9d1aa2dbbb84b5a173b1fbf82390 Mon Sep 17 00:00:00 2001
From: Guillaume Valadon <guillaume.valadon@ssi.gouv.fr>
Date: Mon, 25 Sep 2017 17:32:35 +0200
Subject: [PATCH 1/2] Add more explicit version name

---
 scapy/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scapy/__init__.py b/scapy/__init__.py
index a0e7094df..3126c5e41 100644
--- a/scapy/__init__.py
+++ b/scapy/__init__.py
@@ -80,9 +80,9 @@ def _version():
             sha1 = git_archive_id.strip().split()[0]
             match = re.search(r'tag:(\S+)', git_archive_id)
             if match:
-                return match.group(1)
+                return "git-archive.dev" + match.group(1)
             elif sha1:
-                return sha1
+                return "git-archive.dev" + sha1
             else:
                 return 'unknown.version'
 

From 8a59bf4014411174ada83fd9a2b48bf3a4f2a934 Mon Sep 17 00:00:00 2001
From: Guillaume Valadon <guillaume.valadon@ssi.gouv.fr>
Date: Mon, 25 Sep 2017 17:33:30 +0200
Subject: [PATCH 2/2] Test scapy._version()

---
 test/regression.uts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/test/regression.uts b/test/regression.uts
index 43e5543a7..d34d75cba 100644
--- a/test/regression.uts
+++ b/test/regression.uts
@@ -9110,3 +9110,22 @@ if test_pyx():
     plist.pdfdump(filename)
     assert(os.path.exists(filename))
     os.unlink(filename)
+
+############
+############
++ Scapy version
+
+= _version()
+
+import os
+version_filename = os.path.join(scapy._SCAPY_PKG_DIR, "VERSION")
+
+version = scapy._version()
+assert(os.path.exists(version_filename))
+
+import mock
+with mock.patch("scapy._version_from_git_describe") as version_mocked:
+  version_mocked.side_effect = Exception()
+  assert(scapy._version() == version)
+  os.unlink(version_filename)
+  assert(scapy._version() == "git-archive.dev$Format:%h")