[Pkg-privacy-commits] [tails-installer] 04/07: Comment out the rest of the urlgrabber stuff until it's completely gone
Intrigeri
intrigeri at moszumanska.debian.org
Wed May 24 15:27:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to tag 3.93.2
in repository tails-installer.
commit 25df11457a92948195786e30e4f02676ff44cfa8
Author: Martin Bříza <m at rtinbriza.cz>
Date: Fri Apr 22 17:03:22 2016 +0200
Comment out the rest of the urlgrabber stuff until it's completely gone
---
liveusb/releases.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/liveusb/releases.py b/liveusb/releases.py
index b51ff76..8a12232 100644
--- a/liveusb/releases.py
+++ b/liveusb/releases.py
@@ -4,9 +4,10 @@ import re
import traceback
#todo port away from urlgrabber too
+"""
from urlgrabber import urlread
from urlgrabber.grabber import URLGrabError
-
+"""
from pyquery import pyquery
from liveusb import _
@@ -16,7 +17,7 @@ BASE_URL = 'https://dl.fedoraproject.org'
PUB_URL = BASE_URL + '/pub/fedora/linux/releases/'
ALT_URL = BASE_URL + '/pub/alt/releases/'
ARCHES = ('armhfp', 'x86_64', 'i686', 'i386')
-
+"""
def getArch(url):
return url.split('/')[-1].split('.')[0].split('-')[3]
@@ -228,9 +229,10 @@ def getProducts(url='https://getfedora.org/'):
products.append(getProductDetails(productUrl))
return products
-
+"""
def get_fedora_flavors(store=True):
r = []
+ """
r += getProducts('https://getfedora.org/')
r += [{'name': _('Custom OS...'),
'description': _('<p>Here you can choose a OS image from your hard drive to be written to your flash disk</p><p>Currently it is only supported to write raw disk images (.iso or .bin)</p>'),
@@ -245,6 +247,7 @@ def get_fedora_flavors(store=True):
r += getSpins("http://labs.fedoraproject.org", "Labs")
if (store):
releases[:] = r
+ """
return r
# A backup list of releases, just in case we can't fetch them.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git
More information about the Pkg-privacy-commits
mailing list