Merge branch 'master' into fix-711

.travis.yml

@@ -4,9 +4,9 @@ sudo: required
 language: go
 
 go:
-  - 1.7.x
   - 1.8.x
   - 1.9.x
+  - 1.10.x
   - master
 
 go_import_path: github.com/smira/aptly
@@ -22,6 +22,7 @@ env:
     - secure: "YSwtFrMqh4oUvdSQTXBXMHHLWeQgyNEL23ChIZwU0nuDGIcQZ65kipu0PzefedtUbK4ieC065YCUi4UDDh6gPotB/Wu1pnYg3dyQ7rFvhaVYAAUEpajAdXZhlx+7+J8a4FZMeC/kqiahxoRgLbthF9019ouIqhGB9zHKI6/yZwc="
     - secure: "V7OjWrfQ8UbktgT036jYQPb/7GJT3Ol9LObDr8FYlzsQ+F1uj2wLac6ePuxcOS4FwWOJinWGM1h+JiFkbxbyFqfRNJ0jj0O2p93QyDojxFVOn1mXqqvV66KFqAWR2Vzkny/gDvj8LTvdB1cgAIm2FNOkQc6E1BFnyWS2sN9ea5E="
     - secure: "OxiVNmre2JzUszwPNNilKDgIqtfX2gnRSsVz6nuySB1uO2yQsOQmKWJ9cVYgH2IB5H8eWXKOhexcSE28kz6TPLRuEcU9fnqKY3uEkdwm7rJfz9lf+7C4bJEUdA1OIzJppjnWUiXxD7CEPL1DlnMZM24eDQYqa/4WKACAgkK53gE="
+    - NO_FTP_ACCESS: "yes"
 before_install:
   - virtualenv system/env
   - . system/env/bin/activate

Makefile

@@ -54,7 +54,7 @@ system/env: system/requirements.txt
 system-test: install system/env
 	if [ ! -e ~/aptly-fixture-db ]; then git clone https://github.com/aptly-dev/aptly-fixture-db.git ~/aptly-fixture-db/; fi
 	if [ ! -e ~/aptly-fixture-pool ]; then git clone https://github.com/aptly-dev/aptly-fixture-pool.git ~/aptly-fixture-pool/; fi
-	. system/env/bin/activate && APTLY_VERSION=$(VERSION) PATH=$(BINPATH)/:$(PATH) $(PYTHON) system/run.py --long $(TESTS)
+	PATH=$(BINPATH)/:$(PATH) && . system/env/bin/activate && APTLY_VERSION=$(VERSION) $(PYTHON) system/run.py --long $(TESTS)
 
 travis: $(TRAVIS_TARGET) check system-test
 

README.rst

@@ -48,7 +48,7 @@ To install aptly on Debian/Ubuntu, add new repository to ``/etc/apt/sources.list
 
 And import key that is used to sign the release::
 
-    $ apt-key adv --keyserver keys.gnupg.net --recv-keys 9E3E53F19C7DE460
+    $ apt-key adv --keyserver pool.sks-keyservers.net --recv-keys ED75B5A4483DA07C
 
 After that you can install aptly as any other software package::
 
@@ -64,7 +64,7 @@ If you would like to use nightly builds (unstable), please use following reposit
 
 Binary executables (depends almost only on libc) are available for download from `Bintray <http://dl.bintray.com/smira/aptly/>`_.
 
-If you have Go environment set up, you can build aptly from source by running (go 1.7+ required)::
+If you have Go environment set up, you can build aptly from source by running (go 1.8+ required)::
 
     mkdir -p $GOPATH/src/github.com/smira/aptly
     git clone https://github.com/smira/aptly $GOPATH/src/github.com/smira/aptly
@@ -109,6 +109,10 @@ CLI for aptly API:
 -   `Ruby aptly CLI/library <https://github.com/sepulworld/aptly_cli>`_ by Zane Williamson
 -   `Python aptly CLI (good for CI) <https://github.com/TimSusa/aptly_api_cli>`_ by Tim Susa
 
+GUI for aptly API:
+
+-   `Python aptly GUI (via pyqt5) <https://github.com/chnyda/python-aptly-gui>`_ by Cedric Hnyda
+
 Scala sbt:
 
 -   `sbt aptly plugin <https://github.com/amalakar/sbt-aptly>`_ by Arup Malakar

pgp/gnupg.go

@@ -229,7 +229,7 @@ func (g *GpgVerifier) runGpgv(args []string, context string, showKeyTip bool) (*
 				keys[i] = string(result.MissingKeys[i])
 			}
 
-			fmt.Printf("gpg --no-default-keyring --keyring trustedkeys.gpg --keyserver keys.gnupg.net --recv-keys %s\n\n",
+			fmt.Printf("gpg --no-default-keyring --keyring trustedkeys.gpg --keyserver pool.sks-keyservers.net --recv-keys %s\n\n",
 				strings.Join(keys, " "))
 
 			fmt.Printf("Sometimes keys are stored in repository root in file named Release.key, to import such key:\n\n")

pgp/internal.go

@@ -334,7 +334,7 @@ func (g *GoVerifier) showImportKeyTip(signers []signatureResult) {
 			keys = append(keys, string(KeyFromUint64(signer.IssuerKeyID)))
 		}
 
-		fmt.Printf("gpg --no-default-keyring --keyring trustedkeys.gpg --keyserver keys.gnupg.net --recv-keys %s\n\n",
+		fmt.Printf("gpg --no-default-keyring --keyring trustedkeys.gpg --keyserver pool.sks-keyservers.net --recv-keys %s\n\n",
 			strings.Join(keys, " "))
 
 		fmt.Printf("Sometimes keys are stored in repository root in file named Release.key, to import such key:\n\n")

system/lib.py

@@ -61,6 +61,7 @@ class BaseTest(object):
     fixtureDB = False
     fixtureGpg = False
     fixtureWebServer = False
+    requiresFTP = False
 
     expectedCode = 0
     configFile = {
@@ -118,6 +119,8 @@ class BaseTest(object):
             return False
         if self.fixtureDB and not os.path.exists(self.fixtureDBDir):
             return False
+        if self.requiresFTP and os.environ.get('NO_FTP_ACCESS', '') == 'yes':
+            return False
 
         return True
 

system/t04_mirror/UpdateMirror22Test_gold

@@ -4,7 +4,7 @@ openpgp: Good signature from "NVIDIA CORPORATION (Open Source Projects) <cudatoo
 Downloading & parsing package files...
 Downloading https://nvidia.github.io/libnvidia-container/ubuntu16.04/amd64/Packages.xz...
 Applying filter...
-Packages filtered: 12 -> 0.
+Packages filtered: 16 -> 0.
 Building download queue...
 Download queue: 0 items (0 B)
 

system/t04_mirror/create.py

@@ -253,7 +253,8 @@ class CreateMirror20Test(BaseTest):
     expectedCode = 1
 
     def outputMatchPrepare(_, s):
-        return s.replace('getsockopt: ', '').replace('proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137')
+        return s.replace('getsockopt: ', '').replace('connect: ', ''). \
+            replace('proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137')
 
 
 class CreateMirror21Test(BaseTest):

system/t04_mirror/edit.py

@@ -107,5 +107,6 @@ class EditMirror10Test(BaseTest):
     """
     edit mirror: change archive url
     """
+    requiresFTP = True
     fixtureCmds = ["aptly mirror create -ignore-signatures mirror10 ftp://ftp.ru.debian.org/debian wheezy main"]
     runCmd = "aptly mirror edit -ignore-signatures -archive-url ftp://ftp.ch.debian.org/debian mirror10"

system/t04_mirror/update.py

@@ -155,6 +155,7 @@ class UpdateMirror11Test(BaseTest):
     """
     longTest = False
     fixtureGpg = True
+    requiresFTP = True
     fixtureCmds = [
         "aptly mirror create -keyring=aptlytest.gpg -filter='Priority (required), Name (% s*)' -architectures=i386 wheezy-main ftp://ftp.ru.debian.org/debian/ wheezy main",
     ]