fixed bug that caused adding of GNS2DNS record for zone to migrate, repackaged

15 files changed, 58 insertions, 56 deletions

diff --git a/ascension-0.11.5.tar.gz b/ascension-0.11.5.tar.gz
index f2e52e8..e89d943 100644
--- a/ascension-0.11.5.tar.gz
+++ b/ascension-0.11.5.tar.gz
diff --git a/ascension/ascension.py b/ascension/ascension.py
index 99e659c..3485878 100644
--- a/ascension/ascension.py
+++ b/ascension/ascension.py
@@ -392,14 +392,15 @@ class Ascender():
             else:
                 value = "%s.%s" % (value, self.domain)
         elif rdtype == 'NS':
+            # check if it is zone root
+            if label == "@" and zonename == self.domain:
+                return (None, None, None)
             if self.subzonedict.get(str(label) + "." + zonename):
                 return (None, None, None)
             nameserver = str(record.target)
             if nameserver[-1] == ".":
                 nameserver = nameserver[:-1]
             if str(value)[-1] == ".":
-                if label == "@":
-                    return (None, None, None)
                 # FQDN provided
                 if value.endswith(".%s." % zonename):
                     # in bailiwick
diff --git a/deb_dist/ascension-0.11.5/ascension/ascension.py b/deb_dist/ascension-0.11.5/ascension/ascension.py
index 99e659c..3485878 100644
--- a/deb_dist/ascension-0.11.5/ascension/ascension.py
+++ b/deb_dist/ascension-0.11.5/ascension/ascension.py
@@ -392,14 +392,15 @@ class Ascender():
             else:
                 value = "%s.%s" % (value, self.domain)
         elif rdtype == 'NS':
+            # check if it is zone root
+            if label == "@" and zonename == self.domain:
+                return (None, None, None)
             if self.subzonedict.get(str(label) + "." + zonename):
                 return (None, None, None)
             nameserver = str(record.target)
             if nameserver[-1] == ".":
                 nameserver = nameserver[:-1]
             if str(value)[-1] == ".":
-                if label == "@":
-                    return (None, None, None)
                 # FQDN provided
                 if value.endswith(".%s." % zonename):
                     # in bailiwick
diff --git a/deb_dist/ascension-0.11.5/debian/changelog b/deb_dist/ascension-0.11.5/debian/changelog
index 54b968f..7b1d692 100644
--- a/deb_dist/ascension-0.11.5/debian/changelog
+++ b/deb_dist/ascension-0.11.5/debian/changelog
@@ -2,4 +2,4 @@ ascension (0.11.5-1) unstable; urgency=low
 
   * source package automatically created by stdeb 0.8.5
 
- -- rexxnor <rexxnor+gnunet@brief.li>  Sun, 09 Jun 2019 23:09:20 +0000
+ -- rexxnor <rexxnor+gnunet@brief.li>  Mon, 10 Jun 2019 09:04:59 +0000
diff --git a/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums b/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums
index 96836f7..c3ee02e 100644
--- a/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums
+++ b/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums
@@ -5,6 +5,6 @@ b9326cd655bd4569eaeb5f029ae298d4  usr/lib/python3/dist-packages/ascension-0.11.5
 d41d8cd98f00b204e9800998ecf8427e  usr/lib/python3/dist-packages/ascension-0.11.5.egg-info/requires.txt
 e616e4373e7b199db038fd8e938a3188  usr/lib/python3/dist-packages/ascension-0.11.5.egg-info/top_level.txt
 d41d8cd98f00b204e9800998ecf8427e  usr/lib/python3/dist-packages/ascension/__init__.py
-ba5884a82725a20a216dee53a7b51b98  usr/lib/python3/dist-packages/ascension/ascension.py
+09bacc1c6dadf140cb8ea0c184b8277a  usr/lib/python3/dist-packages/ascension/ascension.py
 de060b4ca299c6460ff508aed915526b  usr/man/man1/ascension.1
-cd977ca340947780acf3233ad9667f52  usr/share/doc/python3-ascension/changelog.Debian.gz
+ef44ced94a2ed58b7da00c6b7c6f0293  usr/share/doc/python3-ascension/changelog.Debian.gz
diff --git a/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz b/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz
index 602e667..6a38225 100644
--- a/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz
+++ b/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz
diff --git a/deb_dist/ascension-0.11.5/debian/rules b/deb_dist/ascension-0.11.5/debian/rules
index 66c24a6..ac44afd 100755
--- a/deb_dist/ascension-0.11.5/debian/rules
+++ b/deb_dist/ascension-0.11.5/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # This file was automatically generated by stdeb 0.8.5 at
-# Sun, 09 Jun 2019 23:09:20 +0000
+# Mon, 10 Jun 2019 09:04:59 +0000
 
 %:
         dh $@ --with python3 --buildsystem=python_distutils
diff --git a/deb_dist/ascension_0.11.5-1.debian.tar.xz b/deb_dist/ascension_0.11.5-1.debian.tar.xz
index 6ba2449..498cf97 100644
--- a/deb_dist/ascension_0.11.5-1.debian.tar.xz
+++ b/deb_dist/ascension_0.11.5-1.debian.tar.xz
diff --git a/deb_dist/ascension_0.11.5-1.dsc b/deb_dist/ascension_0.11.5-1.dsc
index fda3994..c23c0ad 100644
--- a/deb_dist/ascension_0.11.5-1.dsc
+++ b/deb_dist/ascension_0.11.5-1.dsc
@@ -9,11 +9,11 @@ Build-Depends: python3-setuptools, python3-all, debhelper (>= 7.4.3)
 Package-List:
  python3-ascension deb python optional arch=all
 Checksums-Sha1:
- 3641c6b899120b922c2172e59ffac38998fa884b 11021 ascension_0.11.5.orig.tar.gz
- 024b09cb65c08e9dfba9969cb5d6371cb2eab261 1668 ascension_0.11.5-1.debian.tar.xz
+ cfc77ea637849de7ddbb9a19e8d9c3db0da09b2e 11044 ascension_0.11.5.orig.tar.gz
+ 94867b202c9ee182db726768f4d94940a7f3f754 1668 ascension_0.11.5-1.debian.tar.xz
 Checksums-Sha256:
- 304d545f585f6e4e2884f2e3eec869350bbf0fbe992003dc99c237d2c6432f63 11021 ascension_0.11.5.orig.tar.gz
- c6d0e51970e2b87a9386fd6ed66cc80a8d8860b1cb639441ce03b38b26e6a849 1668 ascension_0.11.5-1.debian.tar.xz
+ d4611a7d94682a88a8b36d9cf4e1ef9150771adcac4c0aeedbea1fa705a03597 11044 ascension_0.11.5.orig.tar.gz
+ 212aa23c93f78de27b3f90d14d869e422d4471fc2b8e8fce911016390afad007 1668 ascension_0.11.5-1.debian.tar.xz
 Files:
- c854688f2168e1cfd63aabd0a0888008 11021 ascension_0.11.5.orig.tar.gz
- b22f3fc6dc60771357a4c293c8a652fa 1668 ascension_0.11.5-1.debian.tar.xz
+ 68849b0ffed221f7230bd5a1a0057afb 11044 ascension_0.11.5.orig.tar.gz
+ 01c089d09d35fd857504c4a4d0c6e7e7 1668 ascension_0.11.5-1.debian.tar.xz
diff --git a/deb_dist/ascension_0.11.5-1_amd64.buildinfo b/deb_dist/ascension_0.11.5-1_amd64.buildinfo
index 1f0dd9e..841e3c0 100644
--- a/deb_dist/ascension_0.11.5-1_amd64.buildinfo
+++ b/deb_dist/ascension_0.11.5-1_amd64.buildinfo
@@ -4,17 +4,17 @@ Binary: python3-ascension
 Architecture: all source
 Version: 0.11.5-1
 Checksums-Md5:
- 6f2aeffd03abebe1fce4cae4f190c457 846 ascension_0.11.5-1.dsc
- c07fab7e32337e0b401775994416606a 11776 python3-ascension_0.11.5-1_all.deb
+ 0308a1d8e93e8fca54275a3ae4c3a9ca 846 ascension_0.11.5-1.dsc
+ ffadecc4577dd452822266ed15f80c57 11810 python3-ascension_0.11.5-1_all.deb
 Checksums-Sha1:
- 50f4ed16ea23ee482039a4313d7db1e1f82cc352 846 ascension_0.11.5-1.dsc
- f6a60bffb881503c53cf7232faca332cf0baade2 11776 python3-ascension_0.11.5-1_all.deb
+ 3e0e3d84d4282a978992fb02d80141611ee4589c 846 ascension_0.11.5-1.dsc
+ 017019b5dd09ea62c9a0f44e307c6d4e10edaddd 11810 python3-ascension_0.11.5-1_all.deb
 Checksums-Sha256:
- 408074aa8834808201af6c36634217174cf39edf94bb43b8f04fd67a1a4636c5 846 ascension_0.11.5-1.dsc
- b0750b3ad097d3bc099aebcd59e19e82c876babfa1c7ef6c2c9957ec93aea20c 11776 python3-ascension_0.11.5-1_all.deb
+ 894243f64294410f03cb35fc685c37e49e68f8783e71de0c6a5823ff8c95a983 846 ascension_0.11.5-1.dsc
+ b3cc9b77afdd7fe7fb318bddbf20cde1f61bbb0bf8ff28676d5267d8ef15be86 11810 python3-ascension_0.11.5-1_all.deb
 Build-Origin: Debian
 Build-Architecture: amd64
-Build-Date: Sun, 09 Jun 2019 23:09:57 +0000
+Build-Date: Mon, 10 Jun 2019 09:05:26 +0000
 Installed-Build-Depends:
  autoconf (= 2.69-10),
  automake (= 1:1.15-6),
@@ -177,4 +177,4 @@ Installed-Build-Depends:
  zlib1g (= 1:1.2.8.dfsg-5)
 Environment:
  DEB_BUILD_OPTIONS="parallel=2"
- SOURCE_DATE_EPOCH="1560121760"
+ SOURCE_DATE_EPOCH="1560157499"
diff --git a/deb_dist/ascension_0.11.5-1_amd64.changes b/deb_dist/ascension_0.11.5-1_amd64.changes
index f3971e3..02c98d0 100644
--- a/deb_dist/ascension_0.11.5-1_amd64.changes
+++ b/deb_dist/ascension_0.11.5-1_amd64.changes
@@ -1,5 +1,5 @@
 Format: 1.8
-Date: Sun, 09 Jun 2019 23:09:20 +0000
+Date: Mon, 10 Jun 2019 09:04:59 +0000
 Source: ascension
 Binary: python3-ascension
 Architecture: source all
@@ -15,20 +15,20 @@ Changes:
  .
    * source package automatically created by stdeb 0.8.5
 Checksums-Sha1:
- 50f4ed16ea23ee482039a4313d7db1e1f82cc352 846 ascension_0.11.5-1.dsc
- 3641c6b899120b922c2172e59ffac38998fa884b 11021 ascension_0.11.5.orig.tar.gz
- 024b09cb65c08e9dfba9969cb5d6371cb2eab261 1668 ascension_0.11.5-1.debian.tar.xz
- 798913a6b6e4c349aec9b6f8d1916e170735afd4 5432 ascension_0.11.5-1_amd64.buildinfo
- f6a60bffb881503c53cf7232faca332cf0baade2 11776 python3-ascension_0.11.5-1_all.deb
+ 3e0e3d84d4282a978992fb02d80141611ee4589c 846 ascension_0.11.5-1.dsc
+ cfc77ea637849de7ddbb9a19e8d9c3db0da09b2e 11044 ascension_0.11.5.orig.tar.gz
+ 94867b202c9ee182db726768f4d94940a7f3f754 1668 ascension_0.11.5-1.debian.tar.xz
+ 1f781d12869716008afb307e6e4bb302c876540d 5432 ascension_0.11.5-1_amd64.buildinfo
+ 017019b5dd09ea62c9a0f44e307c6d4e10edaddd 11810 python3-ascension_0.11.5-1_all.deb
 Checksums-Sha256:
- 408074aa8834808201af6c36634217174cf39edf94bb43b8f04fd67a1a4636c5 846 ascension_0.11.5-1.dsc
- 304d545f585f6e4e2884f2e3eec869350bbf0fbe992003dc99c237d2c6432f63 11021 ascension_0.11.5.orig.tar.gz
- c6d0e51970e2b87a9386fd6ed66cc80a8d8860b1cb639441ce03b38b26e6a849 1668 ascension_0.11.5-1.debian.tar.xz
- 0e0a0f9b3df5ee30c84f44e498946c41de2043b7bbe126be586870f7d8886c19 5432 ascension_0.11.5-1_amd64.buildinfo
- b0750b3ad097d3bc099aebcd59e19e82c876babfa1c7ef6c2c9957ec93aea20c 11776 python3-ascension_0.11.5-1_all.deb
+ 894243f64294410f03cb35fc685c37e49e68f8783e71de0c6a5823ff8c95a983 846 ascension_0.11.5-1.dsc
+ d4611a7d94682a88a8b36d9cf4e1ef9150771adcac4c0aeedbea1fa705a03597 11044 ascension_0.11.5.orig.tar.gz
+ 212aa23c93f78de27b3f90d14d869e422d4471fc2b8e8fce911016390afad007 1668 ascension_0.11.5-1.debian.tar.xz
+ 62bf0963597c0ae83fe6241bf91ec0ede1bc55f2727ef1e14e8efb8cd853cafe 5432 ascension_0.11.5-1_amd64.buildinfo
+ b3cc9b77afdd7fe7fb318bddbf20cde1f61bbb0bf8ff28676d5267d8ef15be86 11810 python3-ascension_0.11.5-1_all.deb
 Files:
- 6f2aeffd03abebe1fce4cae4f190c457 846 python optional ascension_0.11.5-1.dsc
- c854688f2168e1cfd63aabd0a0888008 11021 python optional ascension_0.11.5.orig.tar.gz
- b22f3fc6dc60771357a4c293c8a652fa 1668 python optional ascension_0.11.5-1.debian.tar.xz
- c05020e1289ed00dfdcecbeae33d92c9 5432 python optional ascension_0.11.5-1_amd64.buildinfo
- c07fab7e32337e0b401775994416606a 11776 python optional python3-ascension_0.11.5-1_all.deb
+ 0308a1d8e93e8fca54275a3ae4c3a9ca 846 python optional ascension_0.11.5-1.dsc
+ 68849b0ffed221f7230bd5a1a0057afb 11044 python optional ascension_0.11.5.orig.tar.gz
+ 01c089d09d35fd857504c4a4d0c6e7e7 1668 python optional ascension_0.11.5-1.debian.tar.xz
+ 89da52c6d73ef658e86e2faa6f71cccc 5432 python optional ascension_0.11.5-1_amd64.buildinfo
+ ffadecc4577dd452822266ed15f80c57 11810 python optional python3-ascension_0.11.5-1_all.deb
diff --git a/deb_dist/ascension_0.11.5-1_source.buildinfo b/deb_dist/ascension_0.11.5-1_source.buildinfo
index 9e4948b..f6bd786 100644
--- a/deb_dist/ascension_0.11.5-1_source.buildinfo
+++ b/deb_dist/ascension_0.11.5-1_source.buildinfo
@@ -4,14 +4,14 @@ Binary: python3-ascension
 Architecture: source
 Version: 0.11.5-1
 Checksums-Md5:
- ece8ae4d216926030983f06eab691e6f 846 ascension_0.11.5-1.dsc
+ a5a668a766bd4148b6a2ee495b303df5 846 ascension_0.11.5-1.dsc
 Checksums-Sha1:
- 84a9fe5776a5ce3551ca19227f4d9082da9d2959 846 ascension_0.11.5-1.dsc
+ 79ddaf65afda35ac69e472d7de0ce25d65cf96f5 846 ascension_0.11.5-1.dsc
 Checksums-Sha256:
- 900f8a307dbac801992afcaa6306041add65af26c3efe1f40f392b5ed2ca684b 846 ascension_0.11.5-1.dsc
+ e88ca282ff36bcc93cb805c799f71c99d8b3cf32225ea54ff130c503aa91b8fc 846 ascension_0.11.5-1.dsc
 Build-Origin: Debian
 Build-Architecture: amd64
-Build-Date: Sun, 09 Jun 2019 23:09:25 +0000
+Build-Date: Mon, 10 Jun 2019 09:05:04 +0000
 Installed-Build-Depends:
  autoconf (= 2.69-10),
  automake (= 1:1.15-6),
@@ -174,4 +174,4 @@ Installed-Build-Depends:
  zlib1g (= 1:1.2.8.dfsg-5)
 Environment:
  DEB_BUILD_OPTIONS="parallel=2"
- SOURCE_DATE_EPOCH="1560121760"
+ SOURCE_DATE_EPOCH="1560157499"
diff --git a/deb_dist/ascension_0.11.5-1_source.changes b/deb_dist/ascension_0.11.5-1_source.changes
index 4c0123b..f0a6dd0 100644
--- a/deb_dist/ascension_0.11.5-1_source.changes
+++ b/deb_dist/ascension_0.11.5-1_source.changes
@@ -1,5 +1,5 @@
 Format: 1.8
-Date: Sun, 09 Jun 2019 23:09:20 +0000
+Date: Mon, 10 Jun 2019 09:04:59 +0000
 Source: ascension
 Binary: python3-ascension
 Architecture: source
@@ -15,17 +15,17 @@ Changes:
  .
    * source package automatically created by stdeb 0.8.5
 Checksums-Sha1:
- 84a9fe5776a5ce3551ca19227f4d9082da9d2959 846 ascension_0.11.5-1.dsc
- 3641c6b899120b922c2172e59ffac38998fa884b 11021 ascension_0.11.5.orig.tar.gz
- de81376ba7572353442a19f0b22f10b6b4e2d674 1140 ascension_0.11.5-1.debian.tar.xz
- 1aab1f55e9560d60c0f037c300a8fb2d6e00d3d2 5163 ascension_0.11.5-1_source.buildinfo
+ 79ddaf65afda35ac69e472d7de0ce25d65cf96f5 846 ascension_0.11.5-1.dsc
+ cfc77ea637849de7ddbb9a19e8d9c3db0da09b2e 11044 ascension_0.11.5.orig.tar.gz
+ d9ac32149a0996d097c6b2edd5955ffb31be99c2 1140 ascension_0.11.5-1.debian.tar.xz
+ 13013196169d9628b6db3e10b125fea6a6f70652 5163 ascension_0.11.5-1_source.buildinfo
 Checksums-Sha256:
- 900f8a307dbac801992afcaa6306041add65af26c3efe1f40f392b5ed2ca684b 846 ascension_0.11.5-1.dsc
- 304d545f585f6e4e2884f2e3eec869350bbf0fbe992003dc99c237d2c6432f63 11021 ascension_0.11.5.orig.tar.gz
- bc29e29e569b1adc130f3b19c779f502df62b310cb165d9a396f446d93c7463f 1140 ascension_0.11.5-1.debian.tar.xz
- 194941f671f811a9e98ef2b5596b62dbcfec813a9d9c6330527911e2b8d40eb7 5163 ascension_0.11.5-1_source.buildinfo
+ e88ca282ff36bcc93cb805c799f71c99d8b3cf32225ea54ff130c503aa91b8fc 846 ascension_0.11.5-1.dsc
+ d4611a7d94682a88a8b36d9cf4e1ef9150771adcac4c0aeedbea1fa705a03597 11044 ascension_0.11.5.orig.tar.gz
+ 9a41570276e2bbf2b60eef0cccde2395b46aaff9ee820e44f4378bc0c078ef94 1140 ascension_0.11.5-1.debian.tar.xz
+ c0161a4a86c374eb2f7ef2a79307ad62f9effea0e1c824f9d5b81fb134fd760f 5163 ascension_0.11.5-1_source.buildinfo
 Files:
- ece8ae4d216926030983f06eab691e6f 846 python optional ascension_0.11.5-1.dsc
- c854688f2168e1cfd63aabd0a0888008 11021 python optional ascension_0.11.5.orig.tar.gz
- 4efc2aeb10005bf767989d97dc0eaaa3 1140 python optional ascension_0.11.5-1.debian.tar.xz
- 89cd41358d39456f86714df46a4eebf6 5163 python optional ascension_0.11.5-1_source.buildinfo
+ a5a668a766bd4148b6a2ee495b303df5 846 python optional ascension_0.11.5-1.dsc
+ 68849b0ffed221f7230bd5a1a0057afb 11044 python optional ascension_0.11.5.orig.tar.gz
+ cd70ac59e1ba8c63f37d81ce77b722fb 1140 python optional ascension_0.11.5-1.debian.tar.xz
+ d8209831e29f7680d50cb0087e06965d 5163 python optional ascension_0.11.5-1_source.buildinfo
diff --git a/deb_dist/ascension_0.11.5.orig.tar.gz b/deb_dist/ascension_0.11.5.orig.tar.gz
index f2e52e8..e89d943 100644
--- a/deb_dist/ascension_0.11.5.orig.tar.gz
+++ b/deb_dist/ascension_0.11.5.orig.tar.gz
diff --git a/deb_dist/python3-ascension_0.11.5-1_all.deb b/deb_dist/python3-ascension_0.11.5-1_all.deb
index 35ae1c6..c258011 100644
--- a/deb_dist/python3-ascension_0.11.5-1_all.deb
+++ b/deb_dist/python3-ascension_0.11.5-1_all.deb