fix srpm building

Author: gijzelaerr

.dockerignore

@@ -5,6 +5,8 @@
 .ipynb_checkpoints
 .virtualenv
 .virtualenv3
+.tox
+tmp
 build
 dist
 *.egg-info

.gitignore

@@ -111,4 +111,4 @@ ENV/
 
 tests/eduvpn.ovpn
 eduvpn.ovpn
-
+tmp

Makefile

@@ -95,3 +95,9 @@ run: .virtualenv3/bin/eduvpn-client
 
 dockers:
 	for i in `ls docker/Dockerfile*`; do echo "*** $$i"; docker build . -f $$i; done
+
+srpm:
+	docker build -t srpm -f docker/Dockerfile.fedora_26_rpm .
+	mkdir tmp || true
+	docker run -v `pwd`/tmp:/tmp:rw srpm sh -c "cp /root/rpmbuild/SRPMS/* /tmp"
+

docker/Dockerfile.ubuntu_zesty_py3_pep8

@@ -16,7 +16,7 @@ RUN docker-apt-install \
         python3-mock \
         python3-setuptools \
         python3-pytest \
-        python3-pep8
+        pep8
 
 ADD . /code
 WORKDIR /code

eduvpn-client.spec

@@ -112,11 +112,19 @@ eduVPN desktop client
 %{_bindir}/eduvpn-client
 %{_datarootdir}/applications/eduvpn-client.desktop
 %{_datarootdir}/eduvpn/eduvpn.png
-%{_datarootdir}/eduvpn/eduvpn.ui
 %{_datarootdir}/eduvpn/institute.png
 %{_datarootdir}/eduvpn/institute_small.png
 %{_datarootdir}/eduvpn/internet.png
 %{_datarootdir}/eduvpn/internet_small.png
+%{_datarootdir}/eduvpn/builder/2fa.ui
+%{_datarootdir}/eduvpn/builder/connection_type.ui
+%{_datarootdir}/eduvpn/builder/custom_url.ui
+%{_datarootdir}/eduvpn/builder/fetch.ui
+%{_datarootdir}/eduvpn/builder/instances.ui
+%{_datarootdir}/eduvpn/builder/profiles.ui
+%{_datarootdir}/eduvpn/builder/redirecturl.ui
+%{_datarootdir}/eduvpn/builder/token.ui
+%{_datarootdir}/eduvpn/builder/window.ui
 %{_datarootdir}/icons/hicolor/128x128/apps/eduvpn-client.png
 %{_datarootdir}/icons/hicolor/256x256/apps/eduvpn-client.png
 %{_datarootdir}/icons/hicolor/48x48/apps/eduvpn-client.png

eduvpn/manager.py

@@ -45,11 +45,17 @@ def list_providers():
     """
     if not have_dbus():
         # fall back to just listing the json files
-        for p in [i for i in os.listdir(providers_path) if i.endswith('.json')]:
-            try:
-                yield Metadata.from_uuid(p[:-5])
-            except IOError as e:
-                logger.error("cant open {}: {}".format(p, e))
+        try:
+            providers = [i for i in os.listdir(providers_path) if i.endswith('.json')]
+        except IOError as e:
+            logger.error("can't list configurations in {}".format(providers_path))
+            raise StopIteration
+        else:
+            for p in providers:
+                try:
+                    yield Metadata.from_uuid(p[:-5])
+                except IOError as e:
+                    logger.error("cant open {}: {}".format(p, e))
     else:
         all_ = NetworkManager.Settings.ListConnections()
         vpn_connections = [c.GetSettings()['connection'] for c in all_ if c.GetSettings()['connection']['type'] == 'vpn']