liveusb-creator December 2014

liveusb-creator@lists.fedorahosted.org

1 participants
3 discussions

Changes to 'refs/tags/3.13.2'
by Luke Macken 12 Dec '14

12 Dec '14

Tag '3.13.2' created by Luke Macken <lmacken(a)redhat.com> at 2014-12-12 20:48 +0000 3.13.2 Changes since 3.13.1: Luke Macken (8): Merge branch 'release/3.13.1' into develop Minor window sizing tweak to make it look decent on RHEL6 Fix the release detection code to work with latest Fedora products Add support for Spins to the release auto-detection Make the UI a little wider to handle our latest filenames Update the cached list of releases Version bump Make the window a little wider --- data/liveusb-creator.ui | 4 liveusb-creator | 2 liveusb/linux_dialog.py | 4 liveusb/releases.py | 306 +++++++++++++++++++++++++++++++++++------------- setup.py | 2 5 files changed, 234 insertions(+), 84 deletions(-) ---

1 0

Branch 'develop' - 7 commits - data/liveusb-creator.ui liveusb-creator liveusb/linux_dialog.py liveusb/releases.py setup.py
by Luke Macken 12 Dec '14

12 Dec '14

data/liveusb-creator.ui | 2 liveusb-creator | 2 liveusb/linux_dialog.py | 4 liveusb/releases.py | 306 +++++++++++++++++++++++++++++++++++------------- setup.py | 2 5 files changed, 233 insertions(+), 83 deletions(-) New commits: commit 9ead3245bb2f0f3396ccd00d80c9c8d2f5b4d2a3 Merge: 68bfcdf 9aba8ef Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Dec 12 13:48:14 2014 -0700 Merge branch 'release/3.13.2' into develop commit 9aba8efac2b0f866b8ac7619fe5c293dd5a4b3d3 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Dec 12 13:47:22 2014 -0700 Make the window a little wider diff --git a/data/liveusb-creator.ui b/data/liveusb-creator.ui index 279a99d..1c2efb6 100755 --- a/data/liveusb-creator.ui +++ b/data/liveusb-creator.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>637</width> + <width>690</width> <height>538</height> </rect> </property> diff --git a/liveusb/linux_dialog.py b/liveusb/linux_dialog.py index 8c5dfef..5e285df 100644 --- a/liveusb/linux_dialog.py +++ b/liveusb/linux_dialog.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'data/liveusb-creator.ui' # -# Created: Thu Dec 11 17:14:30 2014 +# Created: Fri Dec 12 13:46:45 2014 # by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -26,7 +26,7 @@ except AttributeError: class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(637, 538) + MainWindow.resize(690, 538) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) commit 9af74f264521017dbfa5c7ef39e9bcce470594b7 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Dec 12 13:42:20 2014 -0700 Version bump diff --git a/liveusb-creator b/liveusb-creator index c03c2cf..4a6cb45 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -23,7 +23,7 @@ import sys from liveusb import _ -__version__ = '3.13.1' +__version__ = '3.13.2' def parse_args(): from optparse import OptionParser diff --git a/setup.py b/setup.py index ac45ca2..5770680 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import sys, os -VERSION = '3.13.1' +VERSION = '3.13.2' LOCALE_DIR= '/usr/share/locale' commit 68bfcdf6cac884516e1b32fe0cb257a1fc2feab4 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Dec 11 17:50:35 2014 -0700 Update the cached list of releases diff --git a/liveusb/releases.py b/liveusb/releases.py index 4544b93..a49d776 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -1,4 +1,6 @@ import re +import traceback + from urlgrabber import urlread from urlgrabber.grabber import URLGrabError @@ -7,52 +9,6 @@ PUB_URL = BASE_URL + '/pub/fedora/linux/releases/' ALT_URL = BASE_URL + '/pub/alt/releases/' ARCHES = ('armhfp', 'x86_64', 'i686', 'i386') -# A backup list of releases, just in case we can't fetch them. -fedora_releases = [ - {'name': 'Fedora 20 x86_64 Desktop', - 'sha256': 'cc0333be93c7ff2fb3148cb29360d2453f78913cc8aa6c6289ae6823372a77d2', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, - {'name': 'Fedora 20 x86_64 KDE', - 'sha256': '08360a253b4a40dff948e568dba1d2ae9d931797f57aa08576b8b9f1ef7e4745', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedor…'}, - {'name': 'Fedora 20 i686 Desktop', - 'sha256': 'b115c5653b855de2353e41ff0c72158350f14a020c041462f35ba2a47bd1e33b', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-…'}, - {'name': 'Fedora 20 i686 KDE', - 'sha256': 'd859132ea9496994ccbb5d6e60c9f40ae89ba31f8a4a1a2a883d6d45901de598', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-…'}, - {'name': 'Fedora 19 x86_64 Desktop', - 'sha256': '21f0197284b9088b32d683f83a71bd42261f1df885a63b1eb87254d1ca096f12', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/19/Live/x86_64/Fedor…'}, - {'name': 'Fedora 19 x86_64 KDE', - 'sha256': 'f4479d5639f62d7398722c6a432ba94711b80d5011d5b64e7afebb4f4ac10cf7', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/19/Live/x86_64/Fedor…'}, - {'name': 'Fedora 19 i686 Desktop', - 'sha256': 'ce9797802ef1f7aa670fffd04f209631c171b8ded5dc26f61df898cb9441c839', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/19/Live/i386/Fedora-…'}, - {'name': 'Fedora 19 i686 KDE', - 'sha256': 'e81717564f96ee0f8c6d8b0186e7fca44da57f2ef154ea427b6d765ea139a083', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/19/Live/i386/Fedora-…'}, -] - -other_releases = [ - ## - ## Custom spins - ## - { - 'name': 'Sugar on a Stick v10 (x86_64)', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedor…', - 'sha256': 'b1865e40e57ed5c4bb705f95e3190c5e56ca6ed9c34f53b16e8c45ccb1233be8', - }, - { - 'name': 'Sugar on a Stick v10 (i686)', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-…', - 'sha256': 'efe76d842a7e19a5ee66461bf51a9cf649d426d007841a5f06f14851dceab389', - }, -] - -releases = fedora_releases + other_releases - def get_fedora_releases(): global releases @@ -101,8 +57,188 @@ def get_fedora_releases(): )) except ValueError: pass - releases = fedora_releases + other_releases + releases = fedora_releases except: - # Can't fetch releases from the internet. - releases += other_releases + traceback.print_exc() return releases + + +# A backup list of releases, just in case we can't fetch them. +fedora_releases = [ + {'name': 'Fedora-Live-Workstation-x86_64-21-5', + 'sha256': '4b8418fa846f7dd00e982f3951853e1a4874a1fe023415ae27a5ee313fc98998', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64…'}, + {'name': 'Fedora-Live-Workstation-i686-21-5', + 'sha256': 'e0f189a0539a149ceb34cb2b28260db7780f348443b756904e6a250474953f69', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/i…'}, + {'name': 'Fedora-Server-DVD-x86_64-21', + 'sha256': 'a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/…'}, + {'name': 'Fedora-Server-netinst-x86_64-21', + 'sha256': '56af126a50c227d779a200b414f68ea7bcf58e21c8035500cd21ba164f85b9b4', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/…'}, + {'name': 'Fedora-Server-DVD-i386-21', + 'sha256': '85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fe…'}, + {'name': 'Fedora-Server-netinst-i386-21', + 'sha256': 'a39648334cbf515633f4a70b405a8fbee2662d1e7d1ad686a6861d9e1667e86c', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fe…'}, + {'name': 'Fedora-Cloud-netinst-x86_64-21', + 'sha256': 'be73df48aed44aec7e995cf057d6b8cba7b58c78fb657eb8076376662ec5bd69', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/F…'}, + {'name': 'Fedora-Cloud-netinst-i386-21', + 'sha256': 'b3a169cb8f5b60cec0560d78f826b49384366f4a54434867d6bd90f590a6b9fc', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fed…'}, + {'name': 'Fedora-Live-KDE-x86_64-21-5', + 'sha256': '8459bca9e1005a0bb5ccba377f2908eda75e3ec89ae87f2a4a7b520f673f3b02', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-LXDE-x86_64-21-5', + 'sha256': '55b7c71cdab30ad393dc45fe147a711064e41bb2a62a420025734a33d9b159b6', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-MATE_Compiz-x86_64-21-5', + 'sha256': 'b569c6b78566a365036650ff401984569b005827143a25b4b38a3d9e03d05e4c', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-SoaS-x86_64-21-5', + 'sha256': '0eb962a0666006f1f2bfcd013c01a09f79af773e9325679a68009a7ff5082ed9', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-Xfce-x86_64-21-5', + 'sha256': 'f264e9d43a7ce8eff70fb623954c5aafeb074bc0d182c7b5166c1b64ce1b66df', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-KDE-i686-21-5', + 'sha256': '3a16ee37c9795b6004f31d294af28591cea05ca97c92699fa725eec2352fac71', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-LXDE-i686-21-5', + 'sha256': '306787c561b526372ed95c3cadb3ea5dce8d1c6e30fa501662f18651b43a3d34', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-MATE_Compiz-i686-21-5', + 'sha256': '7cb18731396aa1b364408f42f3795b3b6665f141b1be75e9cba4e4d89bb3c8ec', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-SoaS-i686-21-5', + 'sha256': '1b1b5d4a86e4e2779a4a6137e966fe561a4d694794e3fb60c9b55d71d11e1265', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-Xfce-i686-21-5', + 'sha256': 'cfed2432ce535f309bb439af3b02163b0251313ad77be725189395c137e2fe9d', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-Design_suite-x86_64-21-5', + 'sha256': 'bc81fc61940243795207ea43fe73f280e56bdcd2c454306732e33e214165ef20', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-De…'}, + {'name': 'Fedora-Live-Electronic_Lab-x86_64-21-5', + 'sha256': 'b054004b09aaaa2dd30472de705c956591fcaba17bc20f1eb61ac61bddd7167a', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-El…'}, + {'name': 'Fedora-Live-Games-x86_64-21-5', + 'sha256': 'c5fdcb86d36b896a7f6bfaa04287d78f4512ce1c832b31cf08a3d47018223a5e', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Ga…'}, + {'name': 'Fedora-Live-Jam_KDE-x86_64-21-5', + 'sha256': 'def1f1c08cd1154d0c47900f4883c0efcd3b12f3f42e14cab8a3f40a10d41305', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Ja…'}, + {'name': 'Fedora-Live-Robotics-x86_64-21-5', + 'sha256': 'd0bdd7595b8980354ad594ebab9719e8b58bdff621cec39629f3836c99b3e54e', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Ro…'}, + {'name': 'Fedora-Live-Scientific_KDE-x86_64-21-5', + 'sha256': 'a03ce7eba41d5a517eb5f4ddcd882e68363ffb1e9cce6f8153712a7b9e98eb5f', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Sc…'}, + {'name': 'Fedora-Live-Security-x86_64-21-5', + 'sha256': '08d5e063d69889da9be6677f4d2e07c1ef5df9dcf10689e0f57bea9f974cb98b', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Se…'}, + {'name': 'Fedora-Live-Design_suite-i686-21-5', + 'sha256': '6ab0aff1888d054853c27fd57618a1dcfa7bfabd66c47268c6f6546474db2914', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Desi…'}, + {'name': 'Fedora-Live-Electronic_Lab-i686-21-5', + 'sha256': '212cb78b1146b06dff1207f231c3d278b4c75c7faff25c2347626f1ee942fd0d', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Elec…'}, + {'name': 'Fedora-Live-Games-i686-21-5', + 'sha256': '6866989da6394daa63648084e345b160a5ea659bb3333ce8c19b1b4d92c29d98', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Game…'}, + {'name': 'Fedora-Live-Jam_KDE-i686-21-5', + 'sha256': '6f638a5fb437091886af144092b727cf4767a919b10d69d0b4b4f786e92497ed', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Jam_…'}, + {'name': 'Fedora-Live-Robotics-i686-21-5', + 'sha256': '0814a39a185b66f237ed7ba8f4bc8fdd3a1fe345fec5d4376b5b38a0b28e7d22', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Robo…'}, + {'name': 'Fedora-Live-Scientific_KDE-i686-21-5', + 'sha256': '4df33ad5350f5ad671ab82c9ed4681cf4240495921d173bafbcc8a5cd163492c', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Scie…'}, + {'name': 'Fedora-Live-Security-i686-21-5', + 'sha256': 'bd40a188388f6074cd8258f55a0da1d72f19479c1aea2e68d96380c7f92d99e5', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Secu…'}, + {'name': 'Fedora-Live-Desktop-x86_64-20-1', + 'sha256': 'cc0333be93c7ff2fb3148cb29360d2453f78913cc8aa6c6289ae6823372a77d2', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-KDE-x86_64-20-1', + 'sha256': '08360a253b4a40dff948e568dba1d2ae9d931797f57aa08576b8b9f1ef7e4745', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-LXDE-x86_64-20-1', + 'sha256': 'b5002a697ef0e9e6fe10d0b88da6f7d43dbeb1b2c6dccb274b019123f321487d', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-MATE-Compiz-x86_64-20-1', + 'sha256': '37a3670955210b11e25af93548e1709973431b385379399952de6ae50567b8aa', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-SoaS-x86_64-20-1', + 'sha256': 'b1865e40e57ed5c4bb705f95e3190c5e56ca6ed9c34f53b16e8c45ccb1233be8', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-Xfce-x86_64-20-1', + 'sha256': 'ebfe836aa708d38b66a7ae6fe685ef327772ece5700861bc7c4e83baef0ceb1b', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-Desktop-i686-20-1', + 'sha256': 'b115c5653b855de2353e41ff0c72158350f14a020c041462f35ba2a47bd1e33b', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-KDE-i686-20-1', + 'sha256': 'd859132ea9496994ccbb5d6e60c9f40ae89ba31f8a4a1a2a883d6d45901de598', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-LXDE-i686-20-1', + 'sha256': 'cdfdaa74946792c3e500e32ac923f35c5a6730add9fa1c0997b7ac9b1f7cecae', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-MATE-Compiz-i686-20-1', + 'sha256': 'f885e1bf4db47c2093f0dfa9ef8861bd47103972e3be69ee47054d2568dacd67', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-SoaS-i686-20-1', + 'sha256': 'efe76d842a7e19a5ee66461bf51a9cf649d426d007841a5f06f14851dceab389', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-Xfce-i686-20-1', + 'sha256': '7d3c38414e85c956ea8ead7a1ca333559cec9252e6c330794215ad87a9829b77', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-Design-suite-x86_64-20-1', + 'sha256': '3c334d7918751dc8318d88bc25da281adfefa07e7c0268cdf4221155328b772a', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-De…'}, + {'name': 'Fedora-Live-Electronic-Lab-x86_64-20-1', + 'sha256': '3ea4a88c7104de90bc5392681b274d44410c4c249140b6a08332a96d70fc72c6', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-El…'}, + {'name': 'Fedora-Live-Games-x86_64-20-1', + 'sha256': '3febd35364bd96087dad9c2b4fd19a4275866e4aafff764156708d107d4d2561', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Ga…'}, + {'name': 'Fedora-Live-Jam-KDE-x86_64-20-1', + 'sha256': '348d1ececad7c4a96c94b10c7df35e41c20b645c5ae2f183dc0d132bded570b1', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Ja…'}, + {'name': 'Fedora-Live-Robotics-x86_64-20-1', + 'sha256': '29391a57a48f31d51e9e8aa97c44157c47bfe461a3dab6491c2af399b6e35ce2', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Ro…'}, + {'name': 'Fedora-Live-Scientific-KDE-x86_64-20-1', + 'sha256': '168077683a13657ebd12ae1022932e159115901ad1b991204a0f5be7c47113b9', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Sc…'}, + {'name': 'Fedora-Live-Security-x86_64-20-1', + 'sha256': '1b03c28fccf6497bb3bb863c75fb4149f56565f4962b691834d47b623e7f28af', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Se…'}, + {'name': 'Fedora-Live-Design-suite-i686-20-1', + 'sha256': '608ee0be25dc363f56a5b76e383fc3c9f082ffb824e0b0f1a754e917524fff44', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Desi…'}, + {'name': 'Fedora-Live-Electronic-Lab-i686-20-1', + 'sha256': '0637665a69fe759364620fddf5f50a3b41d1a51f049a6a158886705009bcfc5e', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Elec…'}, + {'name': 'Fedora-Live-Games-i686-20-1', + 'sha256': '5158277d04e55b462665ec1c83fd5cf0b4dd159c5820660bde87d1a27b062b44', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Game…'}, + {'name': 'Fedora-Live-Jam-KDE-i686-20-1', + 'sha256': 'b08a643706229ac701cfebbc328ebe118d467f9620f661939b4877e70b01ab1e', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Jam-…'}, + {'name': 'Fedora-Live-Robotics-i686-20-1', + 'sha256': '77ed1638b454b2a738a0736ed3b1bc29aa10797a4222903e48aa901e44b8833d', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Robo…'}, + {'name': 'Fedora-Live-Scientific-KDE-i686-20-1', + 'sha256': '09f4582423e30459ba06b4fcc29ba5e59894d4ae50353fce376a82ddb94efdb4', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Scie…'}, + {'name': 'Fedora-Live-Security-i686-20-1', + 'sha256': '0030acebc70fb5f1d8efe19204e61263410307f65c192f30571af66711c0c8b9', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Secu…'}, +] + +releases = fedora_releases commit 8c7ad0f3b3e33a49d38d6fc34630028f6373319c Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Dec 11 17:42:43 2014 -0700 Make the UI a little wider to handle our latest filenames diff --git a/data/liveusb-creator.ui b/data/liveusb-creator.ui index 56c26ed..279a99d 100755 --- a/data/liveusb-creator.ui +++ b/data/liveusb-creator.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>574</width> + <width>637</width> <height>538</height> </rect> </property> diff --git a/liveusb/linux_dialog.py b/liveusb/linux_dialog.py index 13b1f28..8c5dfef 100644 --- a/liveusb/linux_dialog.py +++ b/liveusb/linux_dialog.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'data/liveusb-creator.ui' # -# Created: Thu Nov 27 00:54:37 2014 +# Created: Thu Dec 11 17:14:30 2014 # by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -26,7 +26,7 @@ except AttributeError: class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(574, 538) + MainWindow.resize(637, 538) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) commit 10372d4258c96ba51f7779f796b9397282951623 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Dec 11 17:38:44 2014 -0700 Add support for Spins to the release auto-detection diff --git a/liveusb/releases.py b/liveusb/releases.py index ae606ea..4544b93 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -2,7 +2,9 @@ import re from urlgrabber import urlread from urlgrabber.grabber import URLGrabError -FEDORA_RELEASES = 'http://dl.fedoraproject.org/pub/fedora/linux/releases/' +BASE_URL = 'http://dl.fedoraproject.org' +PUB_URL = BASE_URL + '/pub/fedora/linux/releases/' +ALT_URL = BASE_URL + '/pub/alt/releases/' ARCHES = ('armhfp', 'x86_64', 'i686', 'i386') # A backup list of releases, just in case we can't fetch them. @@ -56,22 +58,27 @@ def get_fedora_releases(): global releases fedora_releases = [] try: - html = urlread(FEDORA_RELEASES) + html = urlread(PUB_URL) versions = re.findall(r'<a href="(\d+)/">', html) latest = sorted([int(v) for v in versions], reverse=True)[0:2] for release in latest: if release >= 21: - products = ('Workstation', 'Server', 'Cloud', 'Live') + products = ('Workstation', 'Server', 'Cloud', 'Live', 'Spins') else: - products = ('Live',) + products = ('Live', 'Spins') for product in products: for arch in ARCHES: + baseurl = PUB_URL if product == 'Live': isodir = '/' + elif product == 'Spins': + baseurl = ALT_URL + isodir = '/' else: - isodir = 'iso/' - arch_url = FEDORA_RELEASES + '%s/%s/%s/%s' % (release, + isodir = '/iso/' + arch_url = baseurl + '%s/%s/%s%s' % (release, product, arch, isodir) + print(arch_url) try: files = urlread(arch_url) except URLGrabError: commit a940696c4511c1b8e82cf3b692ae36ddd3a26d55 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Dec 11 17:17:43 2014 -0700 Fix the release detection code to work with latest Fedora products diff --git a/liveusb/releases.py b/liveusb/releases.py index 3522533..ae606ea 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -60,33 +60,40 @@ def get_fedora_releases(): versions = re.findall(r'<a href="(\d+)/">', html) latest = sorted([int(v) for v in versions], reverse=True)[0:2] for release in latest: - for arch in ARCHES: - arch_url = FEDORA_RELEASES + '%s/Live/%s/' % (release, arch) - try: - files = urlread(arch_url) - except URLGrabError: - continue - for link in re.findall(r'<a href="(.*)">', files): - if link.endswith('-CHECKSUM'): - checksum = urlread(arch_url + link) - for line in checksum.split('\n'): - try: - sha256, filename = line.split() - if filename[0] != '*': - continue - filename = filename[1:] - chunks = filename[:-6].split('-') - chunks.remove('Live') - release = chunks.pop() - chunks.insert(1,release) - name = ' '.join(chunks) - fedora_releases.append(dict( - name=name, - url=arch_url + filename, - sha256=sha256, - )) - except ValueError: - pass + if release >= 21: + products = ('Workstation', 'Server', 'Cloud', 'Live') + else: + products = ('Live',) + for product in products: + for arch in ARCHES: + if product == 'Live': + isodir = '/' + else: + isodir = 'iso/' + arch_url = FEDORA_RELEASES + '%s/%s/%s/%s' % (release, + product, arch, isodir) + try: + files = urlread(arch_url) + except URLGrabError: + continue + for link in re.findall(r'<a href="(.*)">', files): + if link.endswith('-CHECKSUM'): + print('Reading %s' % arch_url + link) + checksum = urlread(arch_url + link) + for line in checksum.split('\n'): + try: + sha256, filename = line.split() + if filename[0] != '*': + continue + filename = filename[1:] + name = filename.replace('.iso', '') + fedora_releases.append(dict( + name=name, + url=arch_url + filename, + sha256=sha256, + )) + except ValueError: + pass releases = fedora_releases + other_releases except: # Can't fetch releases from the internet.

1 0

9 commits - data/liveusb-creator.ui liveusb-creator liveusb/linux_dialog.py liveusb/releases.py setup.py
by Luke Macken 12 Dec '14

12 Dec '14

data/liveusb-creator.ui | 4 liveusb-creator | 2 liveusb/linux_dialog.py | 4 liveusb/releases.py | 306 +++++++++++++++++++++++++++++++++++------------- setup.py | 2 5 files changed, 234 insertions(+), 84 deletions(-) New commits: commit 4604f7d30e1967f3251a05e971e37b20f43700d8 Merge: 35b5e90 9aba8ef Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Dec 12 13:48:07 2014 -0700 Merge branch 'release/3.13.2' commit 9aba8efac2b0f866b8ac7619fe5c293dd5a4b3d3 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Dec 12 13:47:22 2014 -0700 Make the window a little wider diff --git a/data/liveusb-creator.ui b/data/liveusb-creator.ui index 279a99d..1c2efb6 100755 --- a/data/liveusb-creator.ui +++ b/data/liveusb-creator.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>637</width> + <width>690</width> <height>538</height> </rect> </property> diff --git a/liveusb/linux_dialog.py b/liveusb/linux_dialog.py index 8c5dfef..5e285df 100644 --- a/liveusb/linux_dialog.py +++ b/liveusb/linux_dialog.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'data/liveusb-creator.ui' # -# Created: Thu Dec 11 17:14:30 2014 +# Created: Fri Dec 12 13:46:45 2014 # by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -26,7 +26,7 @@ except AttributeError: class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(637, 538) + MainWindow.resize(690, 538) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) commit 9af74f264521017dbfa5c7ef39e9bcce470594b7 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Dec 12 13:42:20 2014 -0700 Version bump diff --git a/liveusb-creator b/liveusb-creator index c03c2cf..4a6cb45 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -23,7 +23,7 @@ import sys from liveusb import _ -__version__ = '3.13.1' +__version__ = '3.13.2' def parse_args(): from optparse import OptionParser diff --git a/setup.py b/setup.py index ac45ca2..5770680 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import sys, os -VERSION = '3.13.1' +VERSION = '3.13.2' LOCALE_DIR= '/usr/share/locale' commit 68bfcdf6cac884516e1b32fe0cb257a1fc2feab4 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Dec 11 17:50:35 2014 -0700 Update the cached list of releases diff --git a/liveusb/releases.py b/liveusb/releases.py index 4544b93..a49d776 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -1,4 +1,6 @@ import re +import traceback + from urlgrabber import urlread from urlgrabber.grabber import URLGrabError @@ -7,52 +9,6 @@ PUB_URL = BASE_URL + '/pub/fedora/linux/releases/' ALT_URL = BASE_URL + '/pub/alt/releases/' ARCHES = ('armhfp', 'x86_64', 'i686', 'i386') -# A backup list of releases, just in case we can't fetch them. -fedora_releases = [ - {'name': 'Fedora 20 x86_64 Desktop', - 'sha256': 'cc0333be93c7ff2fb3148cb29360d2453f78913cc8aa6c6289ae6823372a77d2', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, - {'name': 'Fedora 20 x86_64 KDE', - 'sha256': '08360a253b4a40dff948e568dba1d2ae9d931797f57aa08576b8b9f1ef7e4745', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedor…'}, - {'name': 'Fedora 20 i686 Desktop', - 'sha256': 'b115c5653b855de2353e41ff0c72158350f14a020c041462f35ba2a47bd1e33b', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-…'}, - {'name': 'Fedora 20 i686 KDE', - 'sha256': 'd859132ea9496994ccbb5d6e60c9f40ae89ba31f8a4a1a2a883d6d45901de598', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-…'}, - {'name': 'Fedora 19 x86_64 Desktop', - 'sha256': '21f0197284b9088b32d683f83a71bd42261f1df885a63b1eb87254d1ca096f12', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/19/Live/x86_64/Fedor…'}, - {'name': 'Fedora 19 x86_64 KDE', - 'sha256': 'f4479d5639f62d7398722c6a432ba94711b80d5011d5b64e7afebb4f4ac10cf7', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/19/Live/x86_64/Fedor…'}, - {'name': 'Fedora 19 i686 Desktop', - 'sha256': 'ce9797802ef1f7aa670fffd04f209631c171b8ded5dc26f61df898cb9441c839', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/19/Live/i386/Fedora-…'}, - {'name': 'Fedora 19 i686 KDE', - 'sha256': 'e81717564f96ee0f8c6d8b0186e7fca44da57f2ef154ea427b6d765ea139a083', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/19/Live/i386/Fedora-…'}, -] - -other_releases = [ - ## - ## Custom spins - ## - { - 'name': 'Sugar on a Stick v10 (x86_64)', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedor…', - 'sha256': 'b1865e40e57ed5c4bb705f95e3190c5e56ca6ed9c34f53b16e8c45ccb1233be8', - }, - { - 'name': 'Sugar on a Stick v10 (i686)', - 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-…', - 'sha256': 'efe76d842a7e19a5ee66461bf51a9cf649d426d007841a5f06f14851dceab389', - }, -] - -releases = fedora_releases + other_releases - def get_fedora_releases(): global releases @@ -101,8 +57,188 @@ def get_fedora_releases(): )) except ValueError: pass - releases = fedora_releases + other_releases + releases = fedora_releases except: - # Can't fetch releases from the internet. - releases += other_releases + traceback.print_exc() return releases + + +# A backup list of releases, just in case we can't fetch them. +fedora_releases = [ + {'name': 'Fedora-Live-Workstation-x86_64-21-5', + 'sha256': '4b8418fa846f7dd00e982f3951853e1a4874a1fe023415ae27a5ee313fc98998', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64…'}, + {'name': 'Fedora-Live-Workstation-i686-21-5', + 'sha256': 'e0f189a0539a149ceb34cb2b28260db7780f348443b756904e6a250474953f69', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/i…'}, + {'name': 'Fedora-Server-DVD-x86_64-21', + 'sha256': 'a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/…'}, + {'name': 'Fedora-Server-netinst-x86_64-21', + 'sha256': '56af126a50c227d779a200b414f68ea7bcf58e21c8035500cd21ba164f85b9b4', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/…'}, + {'name': 'Fedora-Server-DVD-i386-21', + 'sha256': '85e50a8a938996522bf1605b3578a2d6680362c1aa963d0560d59c2e4fc795ef', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fe…'}, + {'name': 'Fedora-Server-netinst-i386-21', + 'sha256': 'a39648334cbf515633f4a70b405a8fbee2662d1e7d1ad686a6861d9e1667e86c', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fe…'}, + {'name': 'Fedora-Cloud-netinst-x86_64-21', + 'sha256': 'be73df48aed44aec7e995cf057d6b8cba7b58c78fb657eb8076376662ec5bd69', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/F…'}, + {'name': 'Fedora-Cloud-netinst-i386-21', + 'sha256': 'b3a169cb8f5b60cec0560d78f826b49384366f4a54434867d6bd90f590a6b9fc', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fed…'}, + {'name': 'Fedora-Live-KDE-x86_64-21-5', + 'sha256': '8459bca9e1005a0bb5ccba377f2908eda75e3ec89ae87f2a4a7b520f673f3b02', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-LXDE-x86_64-21-5', + 'sha256': '55b7c71cdab30ad393dc45fe147a711064e41bb2a62a420025734a33d9b159b6', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-MATE_Compiz-x86_64-21-5', + 'sha256': 'b569c6b78566a365036650ff401984569b005827143a25b4b38a3d9e03d05e4c', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-SoaS-x86_64-21-5', + 'sha256': '0eb962a0666006f1f2bfcd013c01a09f79af773e9325679a68009a7ff5082ed9', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-Xfce-x86_64-21-5', + 'sha256': 'f264e9d43a7ce8eff70fb623954c5aafeb074bc0d182c7b5166c1b64ce1b66df', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-KDE-i686-21-5', + 'sha256': '3a16ee37c9795b6004f31d294af28591cea05ca97c92699fa725eec2352fac71', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-LXDE-i686-21-5', + 'sha256': '306787c561b526372ed95c3cadb3ea5dce8d1c6e30fa501662f18651b43a3d34', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-MATE_Compiz-i686-21-5', + 'sha256': '7cb18731396aa1b364408f42f3795b3b6665f141b1be75e9cba4e4d89bb3c8ec', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-SoaS-i686-21-5', + 'sha256': '1b1b5d4a86e4e2779a4a6137e966fe561a4d694794e3fb60c9b55d71d11e1265', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-Xfce-i686-21-5', + 'sha256': 'cfed2432ce535f309bb439af3b02163b0251313ad77be725189395c137e2fe9d', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-Design_suite-x86_64-21-5', + 'sha256': 'bc81fc61940243795207ea43fe73f280e56bdcd2c454306732e33e214165ef20', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-De…'}, + {'name': 'Fedora-Live-Electronic_Lab-x86_64-21-5', + 'sha256': 'b054004b09aaaa2dd30472de705c956591fcaba17bc20f1eb61ac61bddd7167a', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-El…'}, + {'name': 'Fedora-Live-Games-x86_64-21-5', + 'sha256': 'c5fdcb86d36b896a7f6bfaa04287d78f4512ce1c832b31cf08a3d47018223a5e', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Ga…'}, + {'name': 'Fedora-Live-Jam_KDE-x86_64-21-5', + 'sha256': 'def1f1c08cd1154d0c47900f4883c0efcd3b12f3f42e14cab8a3f40a10d41305', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Ja…'}, + {'name': 'Fedora-Live-Robotics-x86_64-21-5', + 'sha256': 'd0bdd7595b8980354ad594ebab9719e8b58bdff621cec39629f3836c99b3e54e', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Ro…'}, + {'name': 'Fedora-Live-Scientific_KDE-x86_64-21-5', + 'sha256': 'a03ce7eba41d5a517eb5f4ddcd882e68363ffb1e9cce6f8153712a7b9e98eb5f', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Sc…'}, + {'name': 'Fedora-Live-Security-x86_64-21-5', + 'sha256': '08d5e063d69889da9be6677f4d2e07c1ef5df9dcf10689e0f57bea9f974cb98b', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-Se…'}, + {'name': 'Fedora-Live-Design_suite-i686-21-5', + 'sha256': '6ab0aff1888d054853c27fd57618a1dcfa7bfabd66c47268c6f6546474db2914', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Desi…'}, + {'name': 'Fedora-Live-Electronic_Lab-i686-21-5', + 'sha256': '212cb78b1146b06dff1207f231c3d278b4c75c7faff25c2347626f1ee942fd0d', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Elec…'}, + {'name': 'Fedora-Live-Games-i686-21-5', + 'sha256': '6866989da6394daa63648084e345b160a5ea659bb3333ce8c19b1b4d92c29d98', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Game…'}, + {'name': 'Fedora-Live-Jam_KDE-i686-21-5', + 'sha256': '6f638a5fb437091886af144092b727cf4767a919b10d69d0b4b4f786e92497ed', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Jam_…'}, + {'name': 'Fedora-Live-Robotics-i686-21-5', + 'sha256': '0814a39a185b66f237ed7ba8f4bc8fdd3a1fe345fec5d4376b5b38a0b28e7d22', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Robo…'}, + {'name': 'Fedora-Live-Scientific_KDE-i686-21-5', + 'sha256': '4df33ad5350f5ad671ab82c9ed4681cf4240495921d173bafbcc8a5cd163492c', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Scie…'}, + {'name': 'Fedora-Live-Security-i686-21-5', + 'sha256': 'bd40a188388f6074cd8258f55a0da1d72f19479c1aea2e68d96380c7f92d99e5', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Secu…'}, + {'name': 'Fedora-Live-Desktop-x86_64-20-1', + 'sha256': 'cc0333be93c7ff2fb3148cb29360d2453f78913cc8aa6c6289ae6823372a77d2', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-KDE-x86_64-20-1', + 'sha256': '08360a253b4a40dff948e568dba1d2ae9d931797f57aa08576b8b9f1ef7e4745', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-LXDE-x86_64-20-1', + 'sha256': 'b5002a697ef0e9e6fe10d0b88da6f7d43dbeb1b2c6dccb274b019123f321487d', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-MATE-Compiz-x86_64-20-1', + 'sha256': '37a3670955210b11e25af93548e1709973431b385379399952de6ae50567b8aa', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-SoaS-x86_64-20-1', + 'sha256': 'b1865e40e57ed5c4bb705f95e3190c5e56ca6ed9c34f53b16e8c45ccb1233be8', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-Xfce-x86_64-20-1', + 'sha256': 'ebfe836aa708d38b66a7ae6fe685ef327772ece5700861bc7c4e83baef0ceb1b', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora…'}, + {'name': 'Fedora-Live-Desktop-i686-20-1', + 'sha256': 'b115c5653b855de2353e41ff0c72158350f14a020c041462f35ba2a47bd1e33b', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-KDE-i686-20-1', + 'sha256': 'd859132ea9496994ccbb5d6e60c9f40ae89ba31f8a4a1a2a883d6d45901de598', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-LXDE-i686-20-1', + 'sha256': 'cdfdaa74946792c3e500e32ac923f35c5a6730add9fa1c0997b7ac9b1f7cecae', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-MATE-Compiz-i686-20-1', + 'sha256': 'f885e1bf4db47c2093f0dfa9ef8861bd47103972e3be69ee47054d2568dacd67', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-SoaS-i686-20-1', + 'sha256': 'efe76d842a7e19a5ee66461bf51a9cf649d426d007841a5f06f14851dceab389', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-Xfce-i686-20-1', + 'sha256': '7d3c38414e85c956ea8ead7a1ca333559cec9252e6c330794215ad87a9829b77', + 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-L…'}, + {'name': 'Fedora-Live-Design-suite-x86_64-20-1', + 'sha256': '3c334d7918751dc8318d88bc25da281adfefa07e7c0268cdf4221155328b772a', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-De…'}, + {'name': 'Fedora-Live-Electronic-Lab-x86_64-20-1', + 'sha256': '3ea4a88c7104de90bc5392681b274d44410c4c249140b6a08332a96d70fc72c6', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-El…'}, + {'name': 'Fedora-Live-Games-x86_64-20-1', + 'sha256': '3febd35364bd96087dad9c2b4fd19a4275866e4aafff764156708d107d4d2561', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Ga…'}, + {'name': 'Fedora-Live-Jam-KDE-x86_64-20-1', + 'sha256': '348d1ececad7c4a96c94b10c7df35e41c20b645c5ae2f183dc0d132bded570b1', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Ja…'}, + {'name': 'Fedora-Live-Robotics-x86_64-20-1', + 'sha256': '29391a57a48f31d51e9e8aa97c44157c47bfe461a3dab6491c2af399b6e35ce2', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Ro…'}, + {'name': 'Fedora-Live-Scientific-KDE-x86_64-20-1', + 'sha256': '168077683a13657ebd12ae1022932e159115901ad1b991204a0f5be7c47113b9', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Sc…'}, + {'name': 'Fedora-Live-Security-x86_64-20-1', + 'sha256': '1b03c28fccf6497bb3bb863c75fb4149f56565f4962b691834d47b623e7f28af', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/x86_64/Fedora-Live-Se…'}, + {'name': 'Fedora-Live-Design-suite-i686-20-1', + 'sha256': '608ee0be25dc363f56a5b76e383fc3c9f082ffb824e0b0f1a754e917524fff44', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Desi…'}, + {'name': 'Fedora-Live-Electronic-Lab-i686-20-1', + 'sha256': '0637665a69fe759364620fddf5f50a3b41d1a51f049a6a158886705009bcfc5e', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Elec…'}, + {'name': 'Fedora-Live-Games-i686-20-1', + 'sha256': '5158277d04e55b462665ec1c83fd5cf0b4dd159c5820660bde87d1a27b062b44', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Game…'}, + {'name': 'Fedora-Live-Jam-KDE-i686-20-1', + 'sha256': 'b08a643706229ac701cfebbc328ebe118d467f9620f661939b4877e70b01ab1e', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Jam-…'}, + {'name': 'Fedora-Live-Robotics-i686-20-1', + 'sha256': '77ed1638b454b2a738a0736ed3b1bc29aa10797a4222903e48aa901e44b8833d', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Robo…'}, + {'name': 'Fedora-Live-Scientific-KDE-i686-20-1', + 'sha256': '09f4582423e30459ba06b4fcc29ba5e59894d4ae50353fce376a82ddb94efdb4', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Scie…'}, + {'name': 'Fedora-Live-Security-i686-20-1', + 'sha256': '0030acebc70fb5f1d8efe19204e61263410307f65c192f30571af66711c0c8b9', + 'url': 'http://dl.fedoraproject.org/pub/alt/releases/20/Spins/i386/Fedora-Live-Secu…'}, +] + +releases = fedora_releases commit 8c7ad0f3b3e33a49d38d6fc34630028f6373319c Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Dec 11 17:42:43 2014 -0700 Make the UI a little wider to handle our latest filenames diff --git a/data/liveusb-creator.ui b/data/liveusb-creator.ui index 56c26ed..279a99d 100755 --- a/data/liveusb-creator.ui +++ b/data/liveusb-creator.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>574</width> + <width>637</width> <height>538</height> </rect> </property> diff --git a/liveusb/linux_dialog.py b/liveusb/linux_dialog.py index 13b1f28..8c5dfef 100644 --- a/liveusb/linux_dialog.py +++ b/liveusb/linux_dialog.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'data/liveusb-creator.ui' # -# Created: Thu Nov 27 00:54:37 2014 +# Created: Thu Dec 11 17:14:30 2014 # by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -26,7 +26,7 @@ except AttributeError: class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(574, 538) + MainWindow.resize(637, 538) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) commit 10372d4258c96ba51f7779f796b9397282951623 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Dec 11 17:38:44 2014 -0700 Add support for Spins to the release auto-detection diff --git a/liveusb/releases.py b/liveusb/releases.py index ae606ea..4544b93 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -2,7 +2,9 @@ import re from urlgrabber import urlread from urlgrabber.grabber import URLGrabError -FEDORA_RELEASES = 'http://dl.fedoraproject.org/pub/fedora/linux/releases/' +BASE_URL = 'http://dl.fedoraproject.org' +PUB_URL = BASE_URL + '/pub/fedora/linux/releases/' +ALT_URL = BASE_URL + '/pub/alt/releases/' ARCHES = ('armhfp', 'x86_64', 'i686', 'i386') # A backup list of releases, just in case we can't fetch them. @@ -56,22 +58,27 @@ def get_fedora_releases(): global releases fedora_releases = [] try: - html = urlread(FEDORA_RELEASES) + html = urlread(PUB_URL) versions = re.findall(r'<a href="(\d+)/">', html) latest = sorted([int(v) for v in versions], reverse=True)[0:2] for release in latest: if release >= 21: - products = ('Workstation', 'Server', 'Cloud', 'Live') + products = ('Workstation', 'Server', 'Cloud', 'Live', 'Spins') else: - products = ('Live',) + products = ('Live', 'Spins') for product in products: for arch in ARCHES: + baseurl = PUB_URL if product == 'Live': isodir = '/' + elif product == 'Spins': + baseurl = ALT_URL + isodir = '/' else: - isodir = 'iso/' - arch_url = FEDORA_RELEASES + '%s/%s/%s/%s' % (release, + isodir = '/iso/' + arch_url = baseurl + '%s/%s/%s%s' % (release, product, arch, isodir) + print(arch_url) try: files = urlread(arch_url) except URLGrabError: commit a940696c4511c1b8e82cf3b692ae36ddd3a26d55 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Dec 11 17:17:43 2014 -0700 Fix the release detection code to work with latest Fedora products diff --git a/liveusb/releases.py b/liveusb/releases.py index 3522533..ae606ea 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -60,33 +60,40 @@ def get_fedora_releases(): versions = re.findall(r'<a href="(\d+)/">', html) latest = sorted([int(v) for v in versions], reverse=True)[0:2] for release in latest: - for arch in ARCHES: - arch_url = FEDORA_RELEASES + '%s/Live/%s/' % (release, arch) - try: - files = urlread(arch_url) - except URLGrabError: - continue - for link in re.findall(r'<a href="(.*)">', files): - if link.endswith('-CHECKSUM'): - checksum = urlread(arch_url + link) - for line in checksum.split('\n'): - try: - sha256, filename = line.split() - if filename[0] != '*': - continue - filename = filename[1:] - chunks = filename[:-6].split('-') - chunks.remove('Live') - release = chunks.pop() - chunks.insert(1,release) - name = ' '.join(chunks) - fedora_releases.append(dict( - name=name, - url=arch_url + filename, - sha256=sha256, - )) - except ValueError: - pass + if release >= 21: + products = ('Workstation', 'Server', 'Cloud', 'Live') + else: + products = ('Live',) + for product in products: + for arch in ARCHES: + if product == 'Live': + isodir = '/' + else: + isodir = 'iso/' + arch_url = FEDORA_RELEASES + '%s/%s/%s/%s' % (release, + product, arch, isodir) + try: + files = urlread(arch_url) + except URLGrabError: + continue + for link in re.findall(r'<a href="(.*)">', files): + if link.endswith('-CHECKSUM'): + print('Reading %s' % arch_url + link) + checksum = urlread(arch_url + link) + for line in checksum.split('\n'): + try: + sha256, filename = line.split() + if filename[0] != '*': + continue + filename = filename[1:] + name = filename.replace('.iso', '') + fedora_releases.append(dict( + name=name, + url=arch_url + filename, + sha256=sha256, + )) + except ValueError: + pass releases = fedora_releases + other_releases except: # Can't fetch releases from the internet. commit 7c83196dc671c961835ffacc8204fbcfbd06a6eb Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Nov 27 00:54:44 2014 -0700 Minor window sizing tweak to make it look decent on RHEL6 diff --git a/data/liveusb-creator.ui b/data/liveusb-creator.ui index 81153e2..56c26ed 100755 --- a/data/liveusb-creator.ui +++ b/data/liveusb-creator.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>574</width> - <height>530</height> + <height>538</height> </rect> </property> <property name="sizePolicy"> diff --git a/liveusb/linux_dialog.py b/liveusb/linux_dialog.py index 9613cf6..13b1f28 100644 --- a/liveusb/linux_dialog.py +++ b/liveusb/linux_dialog.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'data/liveusb-creator.ui' # -# Created: Wed Nov 26 15:03:25 2014 +# Created: Thu Nov 27 00:54:37 2014 # by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -26,7 +26,7 @@ except AttributeError: class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(574, 530) + MainWindow.resize(574, 538) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) commit c66449c9e5766f764b9d0d1cbd77384c8c5de17d Merge: a44fbfd 6609ea9 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Nov 27 00:14:16 2014 -0700 Merge branch 'release/3.13.1' into develop

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

liveusb-creator December 2014