liveusb-creator May 2015

liveusb-creator@lists.stg.fedorahosted.org

1 participants
10 discussions

Changes to 'refs/tags/3.14.2'
by Luke Macken 26 May '15

26 May '15

Tag '3.14.2' created by Luke Macken <lmacken(a)redhat.com> at 2015-05-26 20:40 +0000 3.14.2 Changes since 3.14.1: Luke Macken (6): Merge branch 'feature/udisks2' into develop Merge branch 'release/3.14.1' into develop Merge branch 'develop' of github.com:lmacken/liveusb-creator into develop Update the release scraper for the new checksum format in F22 Update the release list for F22 3.14.2 --- liveusb-creator | 2 liveusb-creator.spec | 2 liveusb/releases.py | 279 ++++++++++++++++++++++++++++----------------------- setup.py | 2 4 files changed, 158 insertions(+), 127 deletions(-) ---

1 0

8 commits - liveusb-creator liveusb-creator.spec liveusb/releases.py setup.py
by Luke Macken 26 May '15

26 May '15

liveusb-creator | 2 liveusb-creator.spec | 2 liveusb/releases.py | 279 ++++++++++++++++++++++++++++----------------------- setup.py | 2 4 files changed, 158 insertions(+), 127 deletions(-) New commits: commit 4f6f5677dbaa677d3e7cb598705a941685e1fdcc Merge: 568fbde 30ebad7 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 14:41:15 2015 -0600 Merge branch 'master' of git+ssh://git.fedorahosted.org/git/liveusb-creator commit 568fbde87146b1ae72da9f1480ab8327c33ddbea Merge: 2b3ba8f 10702cc Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 14:40:06 2015 -0600 Merge branch 'release/3.14.2' commit 10702cc998409b47a874eb3da22607b4f4e0200b Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 14:39:41 2015 -0600 3.14.2 diff --git a/liveusb-creator b/liveusb-creator index 58145b3..2fcc667 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -23,7 +23,7 @@ import sys from liveusb import _ -__version__ = '3.14.1' +__version__ = '3.14.2' def parse_args(): from optparse import OptionParser diff --git a/liveusb-creator.spec b/liveusb-creator.spec index 2d2b6f9..6fab7df 100644 --- a/liveusb-creator.spec +++ b/liveusb-creator.spec @@ -7,7 +7,7 @@ %endif Name: liveusb-creator -Version: 3.14.1 +Version: 3.14.2 Release: 1%{?dist} Summary: A liveusb creator diff --git a/setup.py b/setup.py index 93e8439..a517e18 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import sys, os -VERSION = '3.14.1' +VERSION = '3.14.2' LOCALE_DIR= '/usr/share/locale' commit b822d99bbe2c9fed07ba2b827500dbf9d232463f Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 14:38:45 2015 -0600 Update the release list for F22 diff --git a/liveusb/releases.py b/liveusb/releases.py index 4fd9f1b..d73071a 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -4,7 +4,7 @@ import traceback from urlgrabber import urlread from urlgrabber.grabber import URLGrabError -BASE_URL = 'http://dl.fedoraproject.org' +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') @@ -80,180 +80,196 @@ def get_fedora_releases(): # A backup list of releases, just in case we can't fetch them. fedora_releases = [ + {'name': 'Fedora-Live-Workstation-x86_64-22-3', + 'sha256': '615abfc89709a46a078dd1d39638019aa66f62b0ff8325334f1af100551bb6cf', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_6…'}, + {'name': 'Fedora-Workstation-netinst-x86_64-22', + 'sha256': 'c9d22e708b21336582b19b336b7063fc4b882be4cf96d4d0693de07bd66c25e8', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_6…'}, + {'name': 'Fedora-Live-Workstation-i686-22-3', + 'sha256': '6e4c47b582ece2b431ee95d6f453945d11e28c712f7619b178cb31979138f884', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/…'}, + {'name': 'Fedora-Workstation-netinst-i386-22', + 'sha256': 'f223182829022fbabb4321e6c21e43ec515d5446e17b340f6a87496e9b14a6f7', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/…'}, + {'name': 'Fedora-Server-DVD-x86_64-22', + 'sha256': 'b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso…'}, + {'name': 'Fedora-Server-netinst-x86_64-22', + 'sha256': '9f1f2f19f75cc3b97da41878b5c86188fa8d27ed446bd97d9df615c137c77cfc', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso…'}, + {'name': 'Fedora-Server-DVD-i386-22', + 'sha256': '5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/F…'}, + {'name': 'Fedora-Server-netinst-i386-22', + 'sha256': '39df8a90c82ad62b1f1afe25bcb1fed7324179c9ba91d2278c72798721d3702f', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/F…'}, + {'name': 'Fedora-Live-KDE-x86_64-22-3', + 'sha256': '0ccfbe7a2233cff2496aee037e3320471eb4de42ada2e27018cf5ac7adc14fdd', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-LXDE-x86_64-22-3', + 'sha256': '6a444fd233068e0ebebaed665453dd7238d1f7b8cc0930b7dd1c8a866ca0d90b', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-MATE_Compiz-x86_64-22-3', + 'sha256': '2bb1eb56d3cb0bd0f645fa3deac8489ea9cef1c6ca57115f87cfc5e2bd844175', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-SoaS-x86_64-22-3', + 'sha256': 'fc637d47f1590d3cc4f4ad2c725508238c40bdeb9b00dc1ecf1ea5e0f9093d41', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-Xfce-x86_64-22-3', + 'sha256': '08f1c79845b8e6a357aeeba42c7719db0d088d8dbf2df078b3202d2392b18949', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-KDE-i686-22-3', + 'sha256': 'de9b7f049b3c7c10101537e26f3ac9392ca0e9846c3e6bfd63d23f9e7ba8612d', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-LXDE-i686-22-3', + 'sha256': '2301cd9b664fc97602152da8550c6876e70859362c24fc183cd16cd398cac0d6', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-MATE_Compiz-i686-22-3', + 'sha256': '3a1cb11c1d70d0a4c96f028ef59cf5dc3ae1379540556a8413430b85437ab527', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-SoaS-i686-22-3', + 'sha256': '2c9928cb0aa505e011938ede1105da201f3414e1d80787ac079067d0c503cd8f', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-Xfce-i686-22-3', + 'sha256': '4b76fe7db8ee2ad24499e84abfa6830b4f75f45b5772cfcc905ea928cb6852ae', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-Design_suite-x86_64-22-3', + 'sha256': 'c59e48d7ff05424465e20790083049f774e49f0906554bdec36d419a3149f3ac', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-D…'}, + {'name': 'Fedora-Live-Games-x86_64-22-3', + 'sha256': 'b412cba2accfa7150621609ef34c79a46417fb47322d7db64a548c765ffa2354', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-G…'}, + {'name': 'Fedora-Live-Jam_KDE-x86_64-22-3', + 'sha256': 'e7b376161a293a877d187a2cfab49c147810f8e56729d0a1530f02446499277b', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-J…'}, + {'name': 'Fedora-Live-Robotics-x86_64-22-3', + 'sha256': '06e4d9144b4a5bc57b3fc97827eb18537faea2e6df887b444a5cbfa519a1ab27', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-R…'}, + {'name': 'Fedora-Live-Scientific_KDE-x86_64-22-3', + 'sha256': '060a54263da91160f50b30ea3a2bb96c92dca1c0766b9e7cc2dde6cfc3221335', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-S…'}, + {'name': 'Fedora-Live-Security-x86_64-22-3', + 'sha256': '52906c1767716098a059940d675a7ff7ba781b72e75924259effdbd426af72aa', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-S…'}, + {'name': 'Fedora-Live-Design_suite-i686-22-3', + 'sha256': '474d101a6fd30e6a8a91bb18a02996b93d96b71423eb1bd6d8e14334215c1f86', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Des…'}, + {'name': 'Fedora-Live-Games-i686-22-3', + 'sha256': 'e4d318e193148756fcf61868f8d51a0a21ea347ea33c0af5da16a384d80a6dd8', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Gam…'}, + {'name': 'Fedora-Live-Jam_KDE-i686-22-3', + 'sha256': '0026c11cb89f07df96c12d2a414418160963a39872e1faadc0d9bbd5e4c90aa2', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Jam…'}, + {'name': 'Fedora-Live-Robotics-i686-22-3', + 'sha256': '5d6afbed4dfaf822c1cd86ba8605a6e8ebced5aaf563063147c43ad6380559b0', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Rob…'}, + {'name': 'Fedora-Live-Scientific_KDE-i686-22-3', + 'sha256': '286e48dafc6a8ba0f22a482e6ff4f00e71f62ab919858e95b58ce6117a7bc322', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Sci…'}, + {'name': 'Fedora-Live-Security-i686-22-3', + 'sha256': 'acb327698c63cc2fa533d6ad1be122701c728927c690cfc21043a22276d3aa68', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Sec…'}, {'name': 'Fedora-Live-Workstation-x86_64-21-5', 'sha256': '4b8418fa846f7dd00e982f3951853e1a4874a1fe023415ae27a5ee313fc98998', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_6…'}, {'name': 'Fedora-Live-Workstation-i686-21-5', 'sha256': 'e0f189a0539a149ceb34cb2b28260db7780f348443b756904e6a250474953f69', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/i…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/…'}, {'name': 'Fedora-Server-DVD-x86_64-21', 'sha256': 'a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/…'}, + 'url': 'https://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/…'}, + 'url': 'https://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…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/F…'}, {'name': 'Fedora-Server-netinst-i386-21', 'sha256': 'a39648334cbf515633f4a70b405a8fbee2662d1e7d1ad686a6861d9e1667e86c', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fe…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/F…'}, {'name': 'Fedora-Cloud-netinst-x86_64-21', 'sha256': 'be73df48aed44aec7e995cf057d6b8cba7b58c78fb657eb8076376662ec5bd69', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/F…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/…'}, {'name': 'Fedora-Cloud-netinst-i386-21', 'sha256': 'b3a169cb8f5b60cec0560d78f826b49384366f4a54434867d6bd90f590a6b9fc', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fed…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fe…'}, {'name': 'Fedora-Live-KDE-x86_64-21-5', 'sha256': '8459bca9e1005a0bb5ccba377f2908eda75e3ec89ae87f2a4a7b520f673f3b02', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'name': 'Fedora-Live-LXDE-x86_64-21-5', 'sha256': '55b7c71cdab30ad393dc45fe147a711064e41bb2a62a420025734a33d9b159b6', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'name': 'Fedora-Live-SoaS-x86_64-21-5', 'sha256': '0eb962a0666006f1f2bfcd013c01a09f79af773e9325679a68009a7ff5082ed9', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'name': 'Fedora-Live-Xfce-x86_64-21-5', 'sha256': 'f264e9d43a7ce8eff70fb623954c5aafeb074bc0d182c7b5166c1b64ce1b66df', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'name': 'Fedora-Live-KDE-i686-21-5', 'sha256': '3a16ee37c9795b6004f31d294af28591cea05ca97c92699fa725eec2352fac71', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'name': 'Fedora-Live-LXDE-i686-21-5', 'sha256': '306787c561b526372ed95c3cadb3ea5dce8d1c6e30fa501662f18651b43a3d34', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'name': 'Fedora-Live-MATE_Compiz-i686-21-5', 'sha256': '7cb18731396aa1b364408f42f3795b3b6665f141b1be75e9cba4e4d89bb3c8ec', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'name': 'Fedora-Live-SoaS-i686-21-5', 'sha256': '1b1b5d4a86e4e2779a4a6137e966fe561a4d694794e3fb60c9b55d71d11e1265', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'name': 'Fedora-Live-Xfce-i686-21-5', 'sha256': 'cfed2432ce535f309bb439af3b02163b0251313ad77be725189395c137e2fe9d', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-D…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-E…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-G…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-J…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-R…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-S…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-S…'}, {'name': 'Fedora-Live-Design_suite-i686-21-5', 'sha256': '6ab0aff1888d054853c27fd57618a1dcfa7bfabd66c47268c6f6546474db2914', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Desi…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Des…'}, {'name': 'Fedora-Live-Electronic_Lab-i686-21-5', 'sha256': '212cb78b1146b06dff1207f231c3d278b4c75c7faff25c2347626f1ee942fd0d', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Elec…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Ele…'}, {'name': 'Fedora-Live-Games-i686-21-5', 'sha256': '6866989da6394daa63648084e345b160a5ea659bb3333ce8c19b1b4d92c29d98', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Game…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Gam…'}, {'name': 'Fedora-Live-Jam_KDE-i686-21-5', 'sha256': '6f638a5fb437091886af144092b727cf4767a919b10d69d0b4b4f786e92497ed', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Jam_…'}, + 'url': 'https://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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Rob…'}, {'name': 'Fedora-Live-Scientific_KDE-i686-21-5', 'sha256': '4df33ad5350f5ad671ab82c9ed4681cf4240495921d173bafbcc8a5cd163492c', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Scie…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Sci…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Sec…'} ] releases = fedora_releases + +if __name__ == '__main__': + import pprint + pprint.pprint(get_fedora_releases()) commit 54ccd789d402bcadd1c543ceb5225ddb97c922b4 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 14:38:08 2015 -0600 Update the release scraper for the new checksum format in F22 https://fedorahosted.org/rel-eng/ticket/6100 diff --git a/liveusb/releases.py b/liveusb/releases.py index a49d776..4fd9f1b 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -44,19 +44,34 @@ def get_fedora_releases(): 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 + if release >= 22: + # SHA256 (filename) = checksum + if '=' in line: + try: + hash_type, filename, _, sha256 = line.split() + filename = filename[1:-1] + name = filename.replace('.iso', '') + fedora_releases.append(dict( + name=name, + url=arch_url + filename, + sha256=sha256, + )) + except ValueError: + pass + else: + 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 except: traceback.print_exc() commit 18eb0e8dca6b3e9d676a57098f06ecd3478add34 Merge: 0c3231a 8f8f5e9 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 13:16:00 2015 -0600 Merge branch 'develop' of github.com:lmacken/liveusb-creator into develop commit 8f8f5e9af0654510b455c95ac6ead39899c6c43f Merge: 3cb453d 4e7ac2c Author: Luke Macken <lmacken(a)redhat.com> Date: Mon May 25 12:03:17 2015 -0600 Merge branch 'release/3.14.1' into develop commit 0c3231a7c6ae510a0c6cda9873fd8c3548186f30 Merge: 1bc9210 667a54b Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:25:50 2015 -0600 Merge branch 'feature/udisks2' into develop

1 0

Branch 'develop' - 6 commits - liveusb-creator liveusb-creator.spec liveusb/releases.py setup.py
by Luke Macken 26 May '15

26 May '15

liveusb-creator | 2 liveusb-creator.spec | 2 liveusb/releases.py | 279 ++++++++++++++++++++++++++++----------------------- setup.py | 2 4 files changed, 158 insertions(+), 127 deletions(-) New commits: commit c44f8b9cb428491a93bb37f4c5192be94fcd57bf Merge: b822d99 10702cc Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 14:40:10 2015 -0600 Merge branch 'release/3.14.2' into develop commit 10702cc998409b47a874eb3da22607b4f4e0200b Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 14:39:41 2015 -0600 3.14.2 diff --git a/liveusb-creator b/liveusb-creator index 58145b3..2fcc667 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -23,7 +23,7 @@ import sys from liveusb import _ -__version__ = '3.14.1' +__version__ = '3.14.2' def parse_args(): from optparse import OptionParser diff --git a/liveusb-creator.spec b/liveusb-creator.spec index 2d2b6f9..6fab7df 100644 --- a/liveusb-creator.spec +++ b/liveusb-creator.spec @@ -7,7 +7,7 @@ %endif Name: liveusb-creator -Version: 3.14.1 +Version: 3.14.2 Release: 1%{?dist} Summary: A liveusb creator diff --git a/setup.py b/setup.py index 93e8439..a517e18 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import sys, os -VERSION = '3.14.1' +VERSION = '3.14.2' LOCALE_DIR= '/usr/share/locale' commit b822d99bbe2c9fed07ba2b827500dbf9d232463f Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 14:38:45 2015 -0600 Update the release list for F22 diff --git a/liveusb/releases.py b/liveusb/releases.py index 4fd9f1b..d73071a 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -4,7 +4,7 @@ import traceback from urlgrabber import urlread from urlgrabber.grabber import URLGrabError -BASE_URL = 'http://dl.fedoraproject.org' +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') @@ -80,180 +80,196 @@ def get_fedora_releases(): # A backup list of releases, just in case we can't fetch them. fedora_releases = [ + {'name': 'Fedora-Live-Workstation-x86_64-22-3', + 'sha256': '615abfc89709a46a078dd1d39638019aa66f62b0ff8325334f1af100551bb6cf', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_6…'}, + {'name': 'Fedora-Workstation-netinst-x86_64-22', + 'sha256': 'c9d22e708b21336582b19b336b7063fc4b882be4cf96d4d0693de07bd66c25e8', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_6…'}, + {'name': 'Fedora-Live-Workstation-i686-22-3', + 'sha256': '6e4c47b582ece2b431ee95d6f453945d11e28c712f7619b178cb31979138f884', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/…'}, + {'name': 'Fedora-Workstation-netinst-i386-22', + 'sha256': 'f223182829022fbabb4321e6c21e43ec515d5446e17b340f6a87496e9b14a6f7', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/…'}, + {'name': 'Fedora-Server-DVD-x86_64-22', + 'sha256': 'b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso…'}, + {'name': 'Fedora-Server-netinst-x86_64-22', + 'sha256': '9f1f2f19f75cc3b97da41878b5c86188fa8d27ed446bd97d9df615c137c77cfc', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso…'}, + {'name': 'Fedora-Server-DVD-i386-22', + 'sha256': '5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/F…'}, + {'name': 'Fedora-Server-netinst-i386-22', + 'sha256': '39df8a90c82ad62b1f1afe25bcb1fed7324179c9ba91d2278c72798721d3702f', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/F…'}, + {'name': 'Fedora-Live-KDE-x86_64-22-3', + 'sha256': '0ccfbe7a2233cff2496aee037e3320471eb4de42ada2e27018cf5ac7adc14fdd', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-LXDE-x86_64-22-3', + 'sha256': '6a444fd233068e0ebebaed665453dd7238d1f7b8cc0930b7dd1c8a866ca0d90b', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-MATE_Compiz-x86_64-22-3', + 'sha256': '2bb1eb56d3cb0bd0f645fa3deac8489ea9cef1c6ca57115f87cfc5e2bd844175', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-SoaS-x86_64-22-3', + 'sha256': 'fc637d47f1590d3cc4f4ad2c725508238c40bdeb9b00dc1ecf1ea5e0f9093d41', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-Xfce-x86_64-22-3', + 'sha256': '08f1c79845b8e6a357aeeba42c7719db0d088d8dbf2df078b3202d2392b18949', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/x86_64/Fedor…'}, + {'name': 'Fedora-Live-KDE-i686-22-3', + 'sha256': 'de9b7f049b3c7c10101537e26f3ac9392ca0e9846c3e6bfd63d23f9e7ba8612d', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-LXDE-i686-22-3', + 'sha256': '2301cd9b664fc97602152da8550c6876e70859362c24fc183cd16cd398cac0d6', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-MATE_Compiz-i686-22-3', + 'sha256': '3a1cb11c1d70d0a4c96f028ef59cf5dc3ae1379540556a8413430b85437ab527', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-SoaS-i686-22-3', + 'sha256': '2c9928cb0aa505e011938ede1105da201f3414e1d80787ac079067d0c503cd8f', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-Xfce-i686-22-3', + 'sha256': '4b76fe7db8ee2ad24499e84abfa6830b4f75f45b5772cfcc905ea928cb6852ae', + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Live/i386/Fedora-…'}, + {'name': 'Fedora-Live-Design_suite-x86_64-22-3', + 'sha256': 'c59e48d7ff05424465e20790083049f774e49f0906554bdec36d419a3149f3ac', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-D…'}, + {'name': 'Fedora-Live-Games-x86_64-22-3', + 'sha256': 'b412cba2accfa7150621609ef34c79a46417fb47322d7db64a548c765ffa2354', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-G…'}, + {'name': 'Fedora-Live-Jam_KDE-x86_64-22-3', + 'sha256': 'e7b376161a293a877d187a2cfab49c147810f8e56729d0a1530f02446499277b', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-J…'}, + {'name': 'Fedora-Live-Robotics-x86_64-22-3', + 'sha256': '06e4d9144b4a5bc57b3fc97827eb18537faea2e6df887b444a5cbfa519a1ab27', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-R…'}, + {'name': 'Fedora-Live-Scientific_KDE-x86_64-22-3', + 'sha256': '060a54263da91160f50b30ea3a2bb96c92dca1c0766b9e7cc2dde6cfc3221335', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-S…'}, + {'name': 'Fedora-Live-Security-x86_64-22-3', + 'sha256': '52906c1767716098a059940d675a7ff7ba781b72e75924259effdbd426af72aa', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/x86_64/Fedora-Live-S…'}, + {'name': 'Fedora-Live-Design_suite-i686-22-3', + 'sha256': '474d101a6fd30e6a8a91bb18a02996b93d96b71423eb1bd6d8e14334215c1f86', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Des…'}, + {'name': 'Fedora-Live-Games-i686-22-3', + 'sha256': 'e4d318e193148756fcf61868f8d51a0a21ea347ea33c0af5da16a384d80a6dd8', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Gam…'}, + {'name': 'Fedora-Live-Jam_KDE-i686-22-3', + 'sha256': '0026c11cb89f07df96c12d2a414418160963a39872e1faadc0d9bbd5e4c90aa2', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Jam…'}, + {'name': 'Fedora-Live-Robotics-i686-22-3', + 'sha256': '5d6afbed4dfaf822c1cd86ba8605a6e8ebced5aaf563063147c43ad6380559b0', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Rob…'}, + {'name': 'Fedora-Live-Scientific_KDE-i686-22-3', + 'sha256': '286e48dafc6a8ba0f22a482e6ff4f00e71f62ab919858e95b58ce6117a7bc322', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Sci…'}, + {'name': 'Fedora-Live-Security-i686-22-3', + 'sha256': 'acb327698c63cc2fa533d6ad1be122701c728927c690cfc21043a22276d3aa68', + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/22/Spins/i386/Fedora-Live-Sec…'}, {'name': 'Fedora-Live-Workstation-x86_64-21-5', 'sha256': '4b8418fa846f7dd00e982f3951853e1a4874a1fe023415ae27a5ee313fc98998', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_6…'}, {'name': 'Fedora-Live-Workstation-i686-21-5', 'sha256': 'e0f189a0539a149ceb34cb2b28260db7780f348443b756904e6a250474953f69', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/i…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/…'}, {'name': 'Fedora-Server-DVD-x86_64-21', 'sha256': 'a6a2e83bb409d6b8ee3072ad07faac0a54d79c9ecbe3a40af91b773e2d843d8e', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/…'}, + 'url': 'https://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/…'}, + 'url': 'https://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…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/F…'}, {'name': 'Fedora-Server-netinst-i386-21', 'sha256': 'a39648334cbf515633f4a70b405a8fbee2662d1e7d1ad686a6861d9e1667e86c', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fe…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/F…'}, {'name': 'Fedora-Cloud-netinst-x86_64-21', 'sha256': 'be73df48aed44aec7e995cf057d6b8cba7b58c78fb657eb8076376662ec5bd69', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/F…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/…'}, {'name': 'Fedora-Cloud-netinst-i386-21', 'sha256': 'b3a169cb8f5b60cec0560d78f826b49384366f4a54434867d6bd90f590a6b9fc', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fed…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fe…'}, {'name': 'Fedora-Live-KDE-x86_64-21-5', 'sha256': '8459bca9e1005a0bb5ccba377f2908eda75e3ec89ae87f2a4a7b520f673f3b02', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'name': 'Fedora-Live-LXDE-x86_64-21-5', 'sha256': '55b7c71cdab30ad393dc45fe147a711064e41bb2a62a420025734a33d9b159b6', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'name': 'Fedora-Live-SoaS-x86_64-21-5', 'sha256': '0eb962a0666006f1f2bfcd013c01a09f79af773e9325679a68009a7ff5082ed9', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'name': 'Fedora-Live-Xfce-x86_64-21-5', 'sha256': 'f264e9d43a7ce8eff70fb623954c5aafeb074bc0d182c7b5166c1b64ce1b66df', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedor…'}, {'name': 'Fedora-Live-KDE-i686-21-5', 'sha256': '3a16ee37c9795b6004f31d294af28591cea05ca97c92699fa725eec2352fac71', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'name': 'Fedora-Live-LXDE-i686-21-5', 'sha256': '306787c561b526372ed95c3cadb3ea5dce8d1c6e30fa501662f18651b43a3d34', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'name': 'Fedora-Live-MATE_Compiz-i686-21-5', 'sha256': '7cb18731396aa1b364408f42f3795b3b6665f141b1be75e9cba4e4d89bb3c8ec', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'name': 'Fedora-Live-SoaS-i686-21-5', 'sha256': '1b1b5d4a86e4e2779a4a6137e966fe561a4d694794e3fb60c9b55d71d11e1265', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'name': 'Fedora-Live-Xfce-i686-21-5', 'sha256': 'cfed2432ce535f309bb439af3b02163b0251313ad77be725189395c137e2fe9d', - 'url': 'http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-L…'}, + 'url': 'https://dl.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-D…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-E…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-G…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-J…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-R…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-S…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/x86_64/Fedora-Live-S…'}, {'name': 'Fedora-Live-Design_suite-i686-21-5', 'sha256': '6ab0aff1888d054853c27fd57618a1dcfa7bfabd66c47268c6f6546474db2914', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Desi…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Des…'}, {'name': 'Fedora-Live-Electronic_Lab-i686-21-5', 'sha256': '212cb78b1146b06dff1207f231c3d278b4c75c7faff25c2347626f1ee942fd0d', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Elec…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Ele…'}, {'name': 'Fedora-Live-Games-i686-21-5', 'sha256': '6866989da6394daa63648084e345b160a5ea659bb3333ce8c19b1b4d92c29d98', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Game…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Gam…'}, {'name': 'Fedora-Live-Jam_KDE-i686-21-5', 'sha256': '6f638a5fb437091886af144092b727cf4767a919b10d69d0b4b4f786e92497ed', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Jam_…'}, + 'url': 'https://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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Rob…'}, {'name': 'Fedora-Live-Scientific_KDE-i686-21-5', 'sha256': '4df33ad5350f5ad671ab82c9ed4681cf4240495921d173bafbcc8a5cd163492c', - 'url': 'http://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Scie…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Sci…'}, {'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…'}, + 'url': 'https://dl.fedoraproject.org/pub/alt/releases/21/Spins/i386/Fedora-Live-Sec…'} ] releases = fedora_releases + +if __name__ == '__main__': + import pprint + pprint.pprint(get_fedora_releases()) commit 54ccd789d402bcadd1c543ceb5225ddb97c922b4 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 14:38:08 2015 -0600 Update the release scraper for the new checksum format in F22 https://fedorahosted.org/rel-eng/ticket/6100 diff --git a/liveusb/releases.py b/liveusb/releases.py index a49d776..4fd9f1b 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -44,19 +44,34 @@ def get_fedora_releases(): 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 + if release >= 22: + # SHA256 (filename) = checksum + if '=' in line: + try: + hash_type, filename, _, sha256 = line.split() + filename = filename[1:-1] + name = filename.replace('.iso', '') + fedora_releases.append(dict( + name=name, + url=arch_url + filename, + sha256=sha256, + )) + except ValueError: + pass + else: + 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 except: traceback.print_exc() commit 18eb0e8dca6b3e9d676a57098f06ecd3478add34 Merge: 0c3231a 8f8f5e9 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 26 13:16:00 2015 -0600 Merge branch 'develop' of github.com:lmacken/liveusb-creator into develop commit 0c3231a7c6ae510a0c6cda9873fd8c3548186f30 Merge: 1bc9210 667a54b Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:25:50 2015 -0600 Merge branch 'feature/udisks2' into develop

1 0

Branch 'develop' - 4 commits - liveusb-creator liveusb-creator.spec liveusb/gui.py setup.py
by Luke Macken 25 May '15

25 May '15

liveusb-creator | 2 +- liveusb-creator.spec | 5 ++++- liveusb/gui.py | 3 +++ setup.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 8f8f5e9af0654510b455c95ac6ead39899c6c43f Merge: 3cb453d 4e7ac2c Author: Luke Macken <lmacken(a)redhat.com> Date: Mon May 25 12:03:17 2015 -0600 Merge branch 'release/3.14.1' into develop commit 4e7ac2cf3ff8165dfbd4c4e6ee4542da814f9e4f Author: Luke Macken <lmacken(a)redhat.com> Date: Mon May 25 12:02:33 2015 -0600 3.14.1 diff --git a/liveusb-creator b/liveusb-creator index 00b6e15..58145b3 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -23,7 +23,7 @@ import sys from liveusb import _ -__version__ = '3.14.0' +__version__ = '3.14.1' def parse_args(): from optparse import OptionParser diff --git a/liveusb-creator.spec b/liveusb-creator.spec index 554f4dc..2d2b6f9 100644 --- a/liveusb-creator.spec +++ b/liveusb-creator.spec @@ -7,7 +7,7 @@ %endif Name: liveusb-creator -Version: 3.14.0 +Version: 3.14.1 Release: 1%{?dist} Summary: A liveusb creator @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_datadir}/polkit-1/actions/org.fedoraproject.pkexec.run-liveusb-creator.policy %changelog +* Mon May 25 2015 Luke Macken <lmacken(a)redhat.com> - 3.14.0-1 +- Patched to fix black window issue on F22 (#1212180) + * Fri May 22 2015 Luke Macken <lmacken(a)redhat.com> - 3.14.0-1 - Require udisks2 diff --git a/setup.py b/setup.py index ae88ace..93e8439 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import sys, os -VERSION = '3.14.0' +VERSION = '3.14.1' LOCALE_DIR= '/usr/share/locale' commit 3cb453db49245d32860e33c686c261d09fd2c59c Merge: 3c5705a 589eb55 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon May 25 09:44:04 2015 -0600 Merge pull request #23 from jreznik/rhbz1212180 Set graphics system to native to avoid blank windows when X server runs under user commit 589eb5550e8c50df1cac947bc016f9236766007a Author: Jaroslav Reznik <jreznik(a)redhat.com> Date: Mon May 25 15:59:09 2015 +0200 Set graphics system to native to avoid blank windows when X server runs under user (not root) (rhbz#1212180) diff --git a/liveusb/gui.py b/liveusb/gui.py index cdac8cd..fb58089 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -56,6 +56,9 @@ MAX_EXT = 2097152 class LiveUSBApp(QtGui.QApplication): """ Main application class """ def __init__(self, opts, args): + if sys.platform[:5] == 'linux': + QtGui.QApplication.setGraphicsSystem('native') + QtGui.QApplication.__init__(self, args) self.mywindow = LiveUSBWindow(opts, args) self.mywindow.show()

1 0

Changes to 'refs/tags/3.14.1'
by Luke Macken 25 May '15

25 May '15

Tag '3.14.1' created by Luke Macken <lmacken(a)redhat.com> at 2015-05-25 18:03 +0000 3.14.1 Changes since 3.14.0: Jaroslav Reznik (1): Set graphics system to native to avoid blank windows when X server Luke Macken (4): Merge branch 'release/3.14.0' into develop appdata: Update the screenshot Merge pull request #23 from jreznik/rhbz1212180 3.14.1 --- data/liveusb-creator.appdata.xml | 2 +- liveusb-creator | 2 +- liveusb-creator.spec | 5 ++++- liveusb/gui.py | 3 +++ setup.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) ---

1 0

6 commits - data/liveusb-creator.appdata.xml liveusb-creator liveusb-creator.spec liveusb/gui.py setup.py
by Luke Macken 25 May '15

25 May '15

data/liveusb-creator.appdata.xml | 2 +- liveusb-creator | 2 +- liveusb-creator.spec | 5 ++++- liveusb/gui.py | 3 +++ setup.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) New commits: commit 30ebad70491d54367b661318645010134ae4f1e5 Merge: 2b3ba8f 4e7ac2c Author: Luke Macken <lmacken(a)redhat.com> Date: Mon May 25 12:03:11 2015 -0600 Merge branch 'release/3.14.1' commit 4e7ac2cf3ff8165dfbd4c4e6ee4542da814f9e4f Author: Luke Macken <lmacken(a)redhat.com> Date: Mon May 25 12:02:33 2015 -0600 3.14.1 diff --git a/liveusb-creator b/liveusb-creator index 00b6e15..58145b3 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -23,7 +23,7 @@ import sys from liveusb import _ -__version__ = '3.14.0' +__version__ = '3.14.1' def parse_args(): from optparse import OptionParser diff --git a/liveusb-creator.spec b/liveusb-creator.spec index 554f4dc..2d2b6f9 100644 --- a/liveusb-creator.spec +++ b/liveusb-creator.spec @@ -7,7 +7,7 @@ %endif Name: liveusb-creator -Version: 3.14.0 +Version: 3.14.1 Release: 1%{?dist} Summary: A liveusb creator @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_datadir}/polkit-1/actions/org.fedoraproject.pkexec.run-liveusb-creator.policy %changelog +* Mon May 25 2015 Luke Macken <lmacken(a)redhat.com> - 3.14.0-1 +- Patched to fix black window issue on F22 (#1212180) + * Fri May 22 2015 Luke Macken <lmacken(a)redhat.com> - 3.14.0-1 - Require udisks2 diff --git a/setup.py b/setup.py index ae88ace..93e8439 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import sys, os -VERSION = '3.14.0' +VERSION = '3.14.1' LOCALE_DIR= '/usr/share/locale' commit 3cb453db49245d32860e33c686c261d09fd2c59c Merge: 3c5705a 589eb55 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon May 25 09:44:04 2015 -0600 Merge pull request #23 from jreznik/rhbz1212180 Set graphics system to native to avoid blank windows when X server runs under user commit 589eb5550e8c50df1cac947bc016f9236766007a Author: Jaroslav Reznik <jreznik(a)redhat.com> Date: Mon May 25 15:59:09 2015 +0200 Set graphics system to native to avoid blank windows when X server runs under user (not root) (rhbz#1212180) diff --git a/liveusb/gui.py b/liveusb/gui.py index cdac8cd..fb58089 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -56,6 +56,9 @@ MAX_EXT = 2097152 class LiveUSBApp(QtGui.QApplication): """ Main application class """ def __init__(self, opts, args): + if sys.platform[:5] == 'linux': + QtGui.QApplication.setGraphicsSystem('native') + QtGui.QApplication.__init__(self, args) self.mywindow = LiveUSBWindow(opts, args) self.mywindow.show() commit 3c5705a42459404438bc1e9ba5a7cef9b90473e2 Author: Luke Macken <lmacken(a)redhat.com> Date: Sun May 24 12:04:54 2015 -0600 appdata: Update the screenshot diff --git a/data/liveusb-creator.appdata.xml b/data/liveusb-creator.appdata.xml index 552245f..85a3862 100644 --- a/data/liveusb-creator.appdata.xml +++ b/data/liveusb-creator.appdata.xml @@ -22,7 +22,7 @@ </description> <url type="homepage">https://fedorahosted.org/liveusb-creator/</url> <screenshots> - <screenshot type="default">https://fedorahosted.org/liveusb-creator/raw-attachment/wiki/img/liveusb-cr…</screenshot> + <screenshot type="default">https://lmacken.fedorapeople.org/img/liveusb-creator-3.13.png</screenshot> </screenshots> <updatecontact>lmacken(a)redhat.com</updatecontact> </application> commit 27ffda9ae3250b30d96a767f645c13e467b0835b Merge: 52b548e 23f0907 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:41:34 2015 -0600 Merge branch 'release/3.14.0' into develop

1 0

Branch 'develop' - data/liveusb-creator.appdata.xml
by Luke Macken 24 May '15

24 May '15

data/liveusb-creator.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3c5705a42459404438bc1e9ba5a7cef9b90473e2 Author: Luke Macken <lmacken(a)redhat.com> Date: Sun May 24 12:04:54 2015 -0600 appdata: Update the screenshot diff --git a/data/liveusb-creator.appdata.xml b/data/liveusb-creator.appdata.xml index 552245f..85a3862 100644 --- a/data/liveusb-creator.appdata.xml +++ b/data/liveusb-creator.appdata.xml @@ -22,7 +22,7 @@ </description> <url type="homepage">https://fedorahosted.org/liveusb-creator/</url> <screenshots> - <screenshot type="default">https://fedorahosted.org/liveusb-creator/raw-attachment/wiki/img/liveusb-cr…</screenshot> + <screenshot type="default">https://lmacken.fedorapeople.org/img/liveusb-creator-3.13.png</screenshot> </screenshots> <updatecontact>lmacken(a)redhat.com</updatecontact> </application>

1 0

Branch 'develop' - 8 commits - liveusb-creator liveusb/creator.py liveusb-creator.spec README.rst setup.py
by Luke Macken 22 May '15

22 May '15

README.rst | 2 liveusb-creator | 2 liveusb-creator.spec | 7 + liveusb/creator.py | 218 +++++++++++++++++++++++++++------------------------ setup.py | 2 5 files changed, 127 insertions(+), 104 deletions(-) New commits: commit 27ffda9ae3250b30d96a767f645c13e467b0835b Merge: 52b548e 23f0907 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:41:34 2015 -0600 Merge branch 'release/3.14.0' into develop commit 23f0907bf8f6c6a94e5d4658ab4444320f687dac Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:31:52 2015 -0600 3.14.0 diff --git a/liveusb-creator b/liveusb-creator index ccac468..00b6e15 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -23,7 +23,7 @@ import sys from liveusb import _ -__version__ = '3.13.3' +__version__ = '3.14.0' def parse_args(): from optparse import OptionParser diff --git a/liveusb-creator.spec b/liveusb-creator.spec index b58e288..554f4dc 100644 --- a/liveusb-creator.spec +++ b/liveusb-creator.spec @@ -7,7 +7,7 @@ %endif Name: liveusb-creator -Version: 3.13.3 +Version: 3.14.0 Release: 1%{?dist} Summary: A liveusb creator @@ -90,7 +90,7 @@ rm -rf %{buildroot} %{_datadir}/polkit-1/actions/org.fedoraproject.pkexec.run-liveusb-creator.policy %changelog -* Fri May 22 2015 Luke Macken <lmacken(a)redhat.com> +* Fri May 22 2015 Luke Macken <lmacken(a)redhat.com> - 3.14.0-1 - Require udisks2 * Thu Nov 27 2014 Luke Macken <lmacken(a)redhat.com> - 3.13.1-1 diff --git a/setup.py b/setup.py index 8ea643c..ae88ace 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import sys, os -VERSION = '3.13.3' +VERSION = '3.14.0' LOCALE_DIR= '/usr/share/locale' commit 52b548e0922559ad955756fd8492ea358efbf145 Merge: 1bc9210 d55c003 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:30:03 2015 -0600 Merge branch 'feature/udisks2' into develop commit d55c003dfe57a4a43bac30a9a9a50068c250ce36 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:29:53 2015 -0600 rpm: Require udisks2 diff --git a/liveusb-creator.spec b/liveusb-creator.spec index b71ddc4..b58e288 100644 --- a/liveusb-creator.spec +++ b/liveusb-creator.spec @@ -30,7 +30,7 @@ Requires: isomd5sum Requires: python-urlgrabber Requires: pyparted >= 2.0 Requires: syslinux-extlinux -Requires: udisks +Requires: udisks2 Requires: polkit Requires: polkit-gnome @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_datadir}/polkit-1/actions/org.fedoraproject.pkexec.run-liveusb-creator.policy %changelog +* Fri May 22 2015 Luke Macken <lmacken(a)redhat.com> +- Require udisks2 + * Thu Nov 27 2014 Luke Macken <lmacken(a)redhat.com> - 3.13.1-1 - Latest upstream release commit 667a54bf2ee167a8f907e2e06324cf5f79247ba2 Author: Martin Briza <mbriza(a)redhat.com> Date: Fri May 22 15:23:02 2015 +0200 Determine the parent of the drive too and get better information on portability diff --git a/liveusb/creator.py b/liveusb/creator.py index 3640c08..9c562bb 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -515,14 +515,17 @@ class LinuxLiveUSBCreator(LiveUSBCreator): for name, device in self.udisks.GetManagedObjects().iteritems(): if ('org.freedesktop.UDisks2.Block' in device and - 'org.freedesktop.UDisks2.Filesystem' in device): + 'org.freedesktop.UDisks2.Filesystem' in device and + 'org.freedesktop.UDisks2.Partition' in device): self.log.debug('Found block device with filesystem on %s' % name) else: continue + partition = device['org.freedesktop.UDisks2.Partition'] fs = device['org.freedesktop.UDisks2.Filesystem'] blk = device['org.freedesktop.UDisks2.Block'] + """ if blk['HintAuto'] is False: self.log.debug('Skipping non-automounting filesystem: %s' % name) continue @@ -538,10 +541,22 @@ class LinuxLiveUSBCreator(LiveUSBCreator): if blk['HintIgnore'] is True: self.log.debug('Skipping ignorable device: %s' % name) continue + """ if blk['Drive'] == '/': self.log.debug('Skipping root drive: %s' % name) continue + drive_obj = self.bus.get_object("org.freedesktop.UDisks2", blk['Drive']) + drive = dbus.Interface(drive_obj, "org.freedesktop.DBus.Properties").GetAll("org.freedesktop.UDisks2.Drive") + + # this is probably the only check we need, including Drive != "/" + if (not drive[u'Removable'] or + drive[u'Optical'] or + (drive[u'ConnectionBus'] != 'usb' and + drive[u'ConnectionBus'] != 'sdio')): + self.log.debug('Skipping a device that is not removable, connected via USB or is optical: %s' % name) + continue + data = { 'udi': str(blk['Drive']), 'label': str(blk['IdLabel']), @@ -582,6 +597,11 @@ class LinuxLiveUSBCreator(LiveUSBCreator): data['free'] = mount and \ self.get_free_bytes(mount) / 1024**2 or None + print(partition[u'Table']) + parent_obj = self.bus.get_object("org.freedesktop.UDisks2", partition[u'Table']) + parent = dbus.Interface(parent_obj, "org.freedesktop.DBus.Properties").Get("org.freedesktop.UDisks2.Block", "Device") + data['parent'] = strify(parent) + self.log.debug(pformat(data)) self.drives[data['device']] = data commit 56feb46304f197c258e8a93c97aa8a2ef71dd482 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 19 09:22:23 2015 -0400 udisks2: Try isolating devices with the HintAuto flag diff --git a/liveusb/creator.py b/liveusb/creator.py index 4ebd89b..3640c08 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -523,6 +523,9 @@ class LinuxLiveUSBCreator(LiveUSBCreator): fs = device['org.freedesktop.UDisks2.Filesystem'] blk = device['org.freedesktop.UDisks2.Block'] + if blk['HintAuto'] is False: + self.log.debug('Skipping non-automounting filesystem: %s' % name) + continue if blk['HintSystem'] is True: self.log.debug('Skipping system filesystem: %s' % name) continue commit 93e8d757dd1b198c0d81254aaecc74c57001a607 Author: Luke Macken <lmacken(a)redhat.com> Date: Sat May 16 06:39:00 2015 -0500 Port to UDisks2 https://fedorahosted.org/liveusb-creator/ticket/816 diff --git a/liveusb/creator.py b/liveusb/creator.py index c031a12..4ebd89b 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -489,8 +489,7 @@ class LiveUSBCreator(object): class LinuxLiveUSBCreator(LiveUSBCreator): bus = None # the dbus.SystemBus - hal = None # the org.freedesktop.Hal.Manager dbus.Interface - udisks = None # the org.freedesktop.UDisks dbus.Interface + udisks = None # the org.freedesktop.UDisks2 dbus.Interface def __init__(self, *args, **kw): super(LinuxLiveUSBCreator, self).__init__(*args, **kw) @@ -503,92 +502,94 @@ class LinuxLiveUSBCreator(LiveUSBCreator): self.valid_fstypes -= set(['ext4']) def detect_removable_drives(self, callback=None): - """ Detect all removable USB storage devices using UDisks via D-Bus """ + """ Detect all removable USB storage devices using UDisks2 via D-Bus """ import dbus self.drives = {} self.bus = dbus.SystemBus() - udisks_obj = self.bus.get_object("org.freedesktop.UDisks", - "/org/freedesktop/UDisks") - self.udisks = dbus.Interface(udisks_obj, "org.freedesktop.UDisks") - - def handle_reply(devices): - for device in devices: - dev_obj = self.bus.get_object("org.freedesktop.UDisks", device) - dev = dbus.Interface(dev_obj, "org.freedesktop.DBus.Properties") - - data = { - 'udi': str(device), - 'is_optical': bool(dev.Get(device, 'DeviceIsOpticalDisc')), - 'label': unicode(dev.Get(device, 'IdLabel')).replace(' ', '_'), - 'fstype': str(dev.Get(device, 'IdType')), - 'fsversion': str(dev.Get(device, 'IdVersion')), - 'uuid': str(dev.Get(device, 'IdUuid')), - 'device': str(dev.Get(device, 'DeviceFile')), - 'mount': map(unicode, list(dev.Get(device, 'DeviceMountPaths'))), - 'bootable': 'boot' in map(str, - list(dev.Get(device, 'PartitionFlags'))), - 'parent': None, - 'size': int(dev.Get(device, 'DeviceSize')), - } - - # Only pay attention to USB devices, unless --force'd - iface = str(dev.Get(device, 'DriveConnectionInterface')) - if iface != 'usb' and self.opts.force != data['device']: - self.log.warning('Skipping non-usb drive: %s' % device) - continue - - # Skip optical drives - if data['is_optical'] and self.opts.force != data['device']: - self.log.debug('Skipping optical device: %s' % data['device']) - continue - - # Skip things without a size - if not data['size'] and not self.opts.force: - self.log.debug('Skipping device without size: %s' % device) - continue - - # Skip devices with unknown filesystems - if data['fstype'] not in self.valid_fstypes and \ - self.opts.force != data['device']: - self.log.debug('Skipping %s with unknown filesystem: %s' % ( - data['device'], data['fstype'])) - continue - - parent = dev.Get(device, 'PartitionSlave') - if parent and parent != '/': - data['parent'] = str(dbus.Interface(self._get_device(parent), - 'org.freedesktop.DBus.Properties').Get(parent, - 'DeviceFile')) - - mount = data['mount'] - if mount: - if len(mount) > 1: - self.log.warning('Multiple mount points for %s' % - data['device']) - mount = data['mount'] = data['mount'][0] - else: - mount = data['mount'] = None + udisks_obj = self.bus.get_object("org.freedesktop.UDisks2", + "/org/freedesktop/UDisks2") + self.udisks = dbus.Interface(udisks_obj, 'org.freedesktop.DBus.ObjectManager') - data['free'] = mount and \ - self.get_free_bytes(mount) / 1024**2 or None + def strify(s): + return bytearray(s).replace(b'\x00', b'').decode('utf-8') - self.log.debug(pformat(data)) + for name, device in self.udisks.GetManagedObjects().iteritems(): + if ('org.freedesktop.UDisks2.Block' in device and + 'org.freedesktop.UDisks2.Filesystem' in device): + self.log.debug('Found block device with filesystem on %s' % name) + else: + continue + + fs = device['org.freedesktop.UDisks2.Filesystem'] + blk = device['org.freedesktop.UDisks2.Block'] + + if blk['HintSystem'] is True: + self.log.debug('Skipping system filesystem: %s' % name) + continue + if blk['ReadOnly'] is True: + self.log.debug('Skipping read-only filesystem: %s' % name) + continue + if blk['IdUsage'] != 'filesystem': + self.log.debug('Skipping non-filesystem device: %s' % name) + continue + if blk['HintIgnore'] is True: + self.log.debug('Skipping ignorable device: %s' % name) + continue + if blk['Drive'] == '/': + self.log.debug('Skipping root drive: %s' % name) + continue + + data = { + 'udi': str(blk['Drive']), + 'label': str(blk['IdLabel']), + 'fstype': str(blk['IdType']), + 'fsversion': str(blk['IdVersion']), + 'uuid': str(blk['IdUUID']), + 'device': strify(blk['Device']), + 'mount': map(strify, fs['MountPoints']), + 'size': int(blk['Size']), + } + self.log.debug('data = %r' % data) + + if '/boot' in data['mount']: + self.log.debug('Skipping boot device: %s' % name) + continue + + # Skip things without a size + if not data['size'] and not self.opts.force: + self.log.debug('Skipping device without size: %s' % device) + continue + + # Skip devices with unknown filesystems + if data['fstype'] not in self.valid_fstypes and \ + self.opts.force != data['device']: + self.log.debug('Skipping %s with unknown filesystem: %s' % ( + data['device'], data['fstype'])) + continue + + mount = data['mount'] + if mount: + if len(mount) > 1: + self.log.warning('Multiple mount points for %s' % + data['device']) + mount = data['mount'] = data['mount'][0] + else: + mount = data['mount'] = None - self.drives[data['device']] = data + data['free'] = mount and \ + self.get_free_bytes(mount) / 1024**2 or None - # Remove parent drives if a valid partition exists - for parent in [d['parent'] for d in self.drives.values()]: - if parent in self.drives: - del(self.drives[parent]) + self.log.debug(pformat(data)) - if callback: - callback() + self.drives[data['device']] = data - def handle_error(error): - self.log.error(str(error)) + # Remove parent drives if a valid partition exists + #for parent in [d['parent'] for d in self.drives.values()]: + # if parent in self.drives: + # del(self.drives[parent]) - self.udisks.EnumerateDevices(reply_handler=handle_reply, - error_handler=handle_error) + if callback: + callback() def _storage_bus(self, dev): storage_bus = None @@ -633,32 +634,26 @@ class LinuxLiveUSBCreator(LiveUSBCreator): raise LiveUSBError(_("Unsupported filesystem: %s") % self.fstype) self.dest = self.drive['mount'] + mnt = None if not self.dest: try: - self.log.debug("Calling %s.Mount('', %s, [], ...)" % ( - self.drive['udi'], self.fstype)) - dev = self._get_device(self.drive['udi']) - dev.FilesystemMount('', [], - dbus_interface='org.freedesktop.UDisks.Device') + dev = self._get_device_fs(self.drive['udi']) + self.log.debug("Mounting %s" % self.drive['device']) + bd = self.bus.get_object('org.freedesktop.UDisks2', + '/org/freedesktop/UDisks2/block_devices%s' % + self.drive['device'][4:]) + mnt = str(bd.Mount({}, dbus_interface='org.freedesktop.UDisks2.Filesystem')) except dbus.exceptions.DBusException, e: - if e.get_dbus_name() == \ - 'org.freedesktop.Hal.Device.Volume.AlreadyMounted': - self.log.debug(_('Device already mounted')) - else: - self.log.error(_('Unknown dbus exception while trying to ' - 'mount device: %s') % str(e)) + self.log.error(_('Unknown dbus exception while trying to ' + 'mount device: %s') % str(e)) except Exception, e: raise LiveUSBError(_("Unable to mount device: %r" % e)) - # Get the new mount point - udi = self.drive['udi'] - dev_obj = self.bus.get_object("org.freedesktop.UDisks", udi) - dev = dbus.Interface(dev_obj, "org.freedesktop.DBus.Properties") - mounts = map(unicode, list(dev.Get(udi, 'DeviceMountPaths'))) - if not mounts: + if not os.path.exists(mnt): self.log.error(_('No mount points found after mounting attempt')) + self.log.error("%s doesn't exist" % mnt) else: - self.dest = self.drive['mount'] = mounts[0] + self.dest = self.drive['mount'] = mnt self.drive['free'] = self.get_free_bytes(self.dest) / 1024**2 self.log.debug("Mounted %s to %s " % (self.drive['device'], self.dest)) @@ -787,11 +782,11 @@ class LinuxLiveUSBCreator(LiveUSBCreator): stat = os.statvfs(device) return stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL] - def _get_device(self, udi): + def _get_device_fs(self, udi): """ Return a dbus Interface to a specific UDisks device UDI """ import dbus - dev_obj = self.bus.get_object("org.freedesktop.UDisks", udi) - return dbus.Interface(dev_obj, "org.freedesktop.UDisks.Device") + dev_obj = self.bus.get_object("org.freedesktop.UDisks2", udi) + return dbus.Interface(dev_obj, "org.freedesktop.UDisks2.Filesystem") def terminate(self): for pid in self.pids: commit 1bc9210577cdb1e544768effad1c273b222cb02b Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 8 09:49:01 2015 -0600 docs: The logo is licensed under CC-BY-SA 4.0 Per the original author, Kushal Das. 11:32 lmacken> kushal: you made this, right? https://fedoraproject.org/wiki/Archive:Artwork/DesignService/Archive?rd=Art… -- debian folks are asking me about the license of the art 11:34 < kushal> | CC share alike 11:34 lmacken> kushal: cool, CC-BY-SA 3.0? 11:34 lmacken> https://creativecommons.org/licenses/by-sa/3.0/ 11:34 kushal> lmacken, you can choose one for me :) 11:35 kushal> lmacken, I am ok with your choice :) 11:35 lmacken> okay, I'll do the latest diff --git a/README.rst b/README.rst index 548704c..dd83b17 100644 --- a/README.rst +++ b/README.rst @@ -22,6 +22,8 @@ License The liveusb-creator is licensed under the GPLv2. +The liveusb-creator logo is licensed under the `CC-BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/>`_ license. + This tool is distributed with the following open source software:: Python

1 0

Changes to 'refs/tags/3.14.0'
by Luke Macken 22 May '15

22 May '15

Tag '3.14.0' created by Luke Macken <lmacken(a)redhat.com> at 2015-05-22 18:41 +0000 3.14.0 Changes since 3.13.3: Luke Macken (8): Merge branch 'release/3.13.3' into develop Fix the dimensions of the desktop icon (issue #17) docs: The logo is licensed under CC-BY-SA 4.0 Port to UDisks2 udisks2: Try isolating devices with the HintAuto flag rpm: Require udisks2 Merge branch 'feature/udisks2' into develop 3.14.0 Martin Briza (1): Determine the parent of the drive too and get better information on portability --- README.rst | 2 data/fedorausb.png |binary liveusb-creator | 2 liveusb-creator.spec | 7 + liveusb/creator.py | 218 +++++++++++++++++++++++++++------------------------ setup.py | 2 6 files changed, 127 insertions(+), 104 deletions(-) ---

1 0

10 commits - data/fedorausb.png liveusb-creator liveusb/creator.py liveusb-creator.spec README.rst setup.py
by Luke Macken 22 May '15

22 May '15

README.rst | 2 data/fedorausb.png |binary liveusb-creator | 2 liveusb-creator.spec | 7 + liveusb/creator.py | 218 +++++++++++++++++++++++++++------------------------ setup.py | 2 6 files changed, 127 insertions(+), 104 deletions(-) New commits: commit 2b3ba8fc6d302610a328c932a5433e8e238ff5db Merge: b0107b6 23f0907 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:41:28 2015 -0600 Merge branch 'release/3.14.0' commit 23f0907bf8f6c6a94e5d4658ab4444320f687dac Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:31:52 2015 -0600 3.14.0 diff --git a/liveusb-creator b/liveusb-creator index ccac468..00b6e15 100755 --- a/liveusb-creator +++ b/liveusb-creator @@ -23,7 +23,7 @@ import sys from liveusb import _ -__version__ = '3.13.3' +__version__ = '3.14.0' def parse_args(): from optparse import OptionParser diff --git a/liveusb-creator.spec b/liveusb-creator.spec index b58e288..554f4dc 100644 --- a/liveusb-creator.spec +++ b/liveusb-creator.spec @@ -7,7 +7,7 @@ %endif Name: liveusb-creator -Version: 3.13.3 +Version: 3.14.0 Release: 1%{?dist} Summary: A liveusb creator @@ -90,7 +90,7 @@ rm -rf %{buildroot} %{_datadir}/polkit-1/actions/org.fedoraproject.pkexec.run-liveusb-creator.policy %changelog -* Fri May 22 2015 Luke Macken <lmacken(a)redhat.com> +* Fri May 22 2015 Luke Macken <lmacken(a)redhat.com> - 3.14.0-1 - Require udisks2 * Thu Nov 27 2014 Luke Macken <lmacken(a)redhat.com> - 3.13.1-1 diff --git a/setup.py b/setup.py index 8ea643c..ae88ace 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import sys, os -VERSION = '3.13.3' +VERSION = '3.14.0' LOCALE_DIR= '/usr/share/locale' commit 52b548e0922559ad955756fd8492ea358efbf145 Merge: 1bc9210 d55c003 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:30:03 2015 -0600 Merge branch 'feature/udisks2' into develop commit d55c003dfe57a4a43bac30a9a9a50068c250ce36 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 22 12:29:53 2015 -0600 rpm: Require udisks2 diff --git a/liveusb-creator.spec b/liveusb-creator.spec index b71ddc4..b58e288 100644 --- a/liveusb-creator.spec +++ b/liveusb-creator.spec @@ -30,7 +30,7 @@ Requires: isomd5sum Requires: python-urlgrabber Requires: pyparted >= 2.0 Requires: syslinux-extlinux -Requires: udisks +Requires: udisks2 Requires: polkit Requires: polkit-gnome @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_datadir}/polkit-1/actions/org.fedoraproject.pkexec.run-liveusb-creator.policy %changelog +* Fri May 22 2015 Luke Macken <lmacken(a)redhat.com> +- Require udisks2 + * Thu Nov 27 2014 Luke Macken <lmacken(a)redhat.com> - 3.13.1-1 - Latest upstream release commit 667a54bf2ee167a8f907e2e06324cf5f79247ba2 Author: Martin Briza <mbriza(a)redhat.com> Date: Fri May 22 15:23:02 2015 +0200 Determine the parent of the drive too and get better information on portability diff --git a/liveusb/creator.py b/liveusb/creator.py index 3640c08..9c562bb 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -515,14 +515,17 @@ class LinuxLiveUSBCreator(LiveUSBCreator): for name, device in self.udisks.GetManagedObjects().iteritems(): if ('org.freedesktop.UDisks2.Block' in device and - 'org.freedesktop.UDisks2.Filesystem' in device): + 'org.freedesktop.UDisks2.Filesystem' in device and + 'org.freedesktop.UDisks2.Partition' in device): self.log.debug('Found block device with filesystem on %s' % name) else: continue + partition = device['org.freedesktop.UDisks2.Partition'] fs = device['org.freedesktop.UDisks2.Filesystem'] blk = device['org.freedesktop.UDisks2.Block'] + """ if blk['HintAuto'] is False: self.log.debug('Skipping non-automounting filesystem: %s' % name) continue @@ -538,10 +541,22 @@ class LinuxLiveUSBCreator(LiveUSBCreator): if blk['HintIgnore'] is True: self.log.debug('Skipping ignorable device: %s' % name) continue + """ if blk['Drive'] == '/': self.log.debug('Skipping root drive: %s' % name) continue + drive_obj = self.bus.get_object("org.freedesktop.UDisks2", blk['Drive']) + drive = dbus.Interface(drive_obj, "org.freedesktop.DBus.Properties").GetAll("org.freedesktop.UDisks2.Drive") + + # this is probably the only check we need, including Drive != "/" + if (not drive[u'Removable'] or + drive[u'Optical'] or + (drive[u'ConnectionBus'] != 'usb' and + drive[u'ConnectionBus'] != 'sdio')): + self.log.debug('Skipping a device that is not removable, connected via USB or is optical: %s' % name) + continue + data = { 'udi': str(blk['Drive']), 'label': str(blk['IdLabel']), @@ -582,6 +597,11 @@ class LinuxLiveUSBCreator(LiveUSBCreator): data['free'] = mount and \ self.get_free_bytes(mount) / 1024**2 or None + print(partition[u'Table']) + parent_obj = self.bus.get_object("org.freedesktop.UDisks2", partition[u'Table']) + parent = dbus.Interface(parent_obj, "org.freedesktop.DBus.Properties").Get("org.freedesktop.UDisks2.Block", "Device") + data['parent'] = strify(parent) + self.log.debug(pformat(data)) self.drives[data['device']] = data commit 56feb46304f197c258e8a93c97aa8a2ef71dd482 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 19 09:22:23 2015 -0400 udisks2: Try isolating devices with the HintAuto flag diff --git a/liveusb/creator.py b/liveusb/creator.py index 4ebd89b..3640c08 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -523,6 +523,9 @@ class LinuxLiveUSBCreator(LiveUSBCreator): fs = device['org.freedesktop.UDisks2.Filesystem'] blk = device['org.freedesktop.UDisks2.Block'] + if blk['HintAuto'] is False: + self.log.debug('Skipping non-automounting filesystem: %s' % name) + continue if blk['HintSystem'] is True: self.log.debug('Skipping system filesystem: %s' % name) continue commit 93e8d757dd1b198c0d81254aaecc74c57001a607 Author: Luke Macken <lmacken(a)redhat.com> Date: Sat May 16 06:39:00 2015 -0500 Port to UDisks2 https://fedorahosted.org/liveusb-creator/ticket/816 diff --git a/liveusb/creator.py b/liveusb/creator.py index c031a12..4ebd89b 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -489,8 +489,7 @@ class LiveUSBCreator(object): class LinuxLiveUSBCreator(LiveUSBCreator): bus = None # the dbus.SystemBus - hal = None # the org.freedesktop.Hal.Manager dbus.Interface - udisks = None # the org.freedesktop.UDisks dbus.Interface + udisks = None # the org.freedesktop.UDisks2 dbus.Interface def __init__(self, *args, **kw): super(LinuxLiveUSBCreator, self).__init__(*args, **kw) @@ -503,92 +502,94 @@ class LinuxLiveUSBCreator(LiveUSBCreator): self.valid_fstypes -= set(['ext4']) def detect_removable_drives(self, callback=None): - """ Detect all removable USB storage devices using UDisks via D-Bus """ + """ Detect all removable USB storage devices using UDisks2 via D-Bus """ import dbus self.drives = {} self.bus = dbus.SystemBus() - udisks_obj = self.bus.get_object("org.freedesktop.UDisks", - "/org/freedesktop/UDisks") - self.udisks = dbus.Interface(udisks_obj, "org.freedesktop.UDisks") - - def handle_reply(devices): - for device in devices: - dev_obj = self.bus.get_object("org.freedesktop.UDisks", device) - dev = dbus.Interface(dev_obj, "org.freedesktop.DBus.Properties") - - data = { - 'udi': str(device), - 'is_optical': bool(dev.Get(device, 'DeviceIsOpticalDisc')), - 'label': unicode(dev.Get(device, 'IdLabel')).replace(' ', '_'), - 'fstype': str(dev.Get(device, 'IdType')), - 'fsversion': str(dev.Get(device, 'IdVersion')), - 'uuid': str(dev.Get(device, 'IdUuid')), - 'device': str(dev.Get(device, 'DeviceFile')), - 'mount': map(unicode, list(dev.Get(device, 'DeviceMountPaths'))), - 'bootable': 'boot' in map(str, - list(dev.Get(device, 'PartitionFlags'))), - 'parent': None, - 'size': int(dev.Get(device, 'DeviceSize')), - } - - # Only pay attention to USB devices, unless --force'd - iface = str(dev.Get(device, 'DriveConnectionInterface')) - if iface != 'usb' and self.opts.force != data['device']: - self.log.warning('Skipping non-usb drive: %s' % device) - continue - - # Skip optical drives - if data['is_optical'] and self.opts.force != data['device']: - self.log.debug('Skipping optical device: %s' % data['device']) - continue - - # Skip things without a size - if not data['size'] and not self.opts.force: - self.log.debug('Skipping device without size: %s' % device) - continue - - # Skip devices with unknown filesystems - if data['fstype'] not in self.valid_fstypes and \ - self.opts.force != data['device']: - self.log.debug('Skipping %s with unknown filesystem: %s' % ( - data['device'], data['fstype'])) - continue - - parent = dev.Get(device, 'PartitionSlave') - if parent and parent != '/': - data['parent'] = str(dbus.Interface(self._get_device(parent), - 'org.freedesktop.DBus.Properties').Get(parent, - 'DeviceFile')) - - mount = data['mount'] - if mount: - if len(mount) > 1: - self.log.warning('Multiple mount points for %s' % - data['device']) - mount = data['mount'] = data['mount'][0] - else: - mount = data['mount'] = None + udisks_obj = self.bus.get_object("org.freedesktop.UDisks2", + "/org/freedesktop/UDisks2") + self.udisks = dbus.Interface(udisks_obj, 'org.freedesktop.DBus.ObjectManager') - data['free'] = mount and \ - self.get_free_bytes(mount) / 1024**2 or None + def strify(s): + return bytearray(s).replace(b'\x00', b'').decode('utf-8') - self.log.debug(pformat(data)) + for name, device in self.udisks.GetManagedObjects().iteritems(): + if ('org.freedesktop.UDisks2.Block' in device and + 'org.freedesktop.UDisks2.Filesystem' in device): + self.log.debug('Found block device with filesystem on %s' % name) + else: + continue + + fs = device['org.freedesktop.UDisks2.Filesystem'] + blk = device['org.freedesktop.UDisks2.Block'] + + if blk['HintSystem'] is True: + self.log.debug('Skipping system filesystem: %s' % name) + continue + if blk['ReadOnly'] is True: + self.log.debug('Skipping read-only filesystem: %s' % name) + continue + if blk['IdUsage'] != 'filesystem': + self.log.debug('Skipping non-filesystem device: %s' % name) + continue + if blk['HintIgnore'] is True: + self.log.debug('Skipping ignorable device: %s' % name) + continue + if blk['Drive'] == '/': + self.log.debug('Skipping root drive: %s' % name) + continue + + data = { + 'udi': str(blk['Drive']), + 'label': str(blk['IdLabel']), + 'fstype': str(blk['IdType']), + 'fsversion': str(blk['IdVersion']), + 'uuid': str(blk['IdUUID']), + 'device': strify(blk['Device']), + 'mount': map(strify, fs['MountPoints']), + 'size': int(blk['Size']), + } + self.log.debug('data = %r' % data) + + if '/boot' in data['mount']: + self.log.debug('Skipping boot device: %s' % name) + continue + + # Skip things without a size + if not data['size'] and not self.opts.force: + self.log.debug('Skipping device without size: %s' % device) + continue + + # Skip devices with unknown filesystems + if data['fstype'] not in self.valid_fstypes and \ + self.opts.force != data['device']: + self.log.debug('Skipping %s with unknown filesystem: %s' % ( + data['device'], data['fstype'])) + continue + + mount = data['mount'] + if mount: + if len(mount) > 1: + self.log.warning('Multiple mount points for %s' % + data['device']) + mount = data['mount'] = data['mount'][0] + else: + mount = data['mount'] = None - self.drives[data['device']] = data + data['free'] = mount and \ + self.get_free_bytes(mount) / 1024**2 or None - # Remove parent drives if a valid partition exists - for parent in [d['parent'] for d in self.drives.values()]: - if parent in self.drives: - del(self.drives[parent]) + self.log.debug(pformat(data)) - if callback: - callback() + self.drives[data['device']] = data - def handle_error(error): - self.log.error(str(error)) + # Remove parent drives if a valid partition exists + #for parent in [d['parent'] for d in self.drives.values()]: + # if parent in self.drives: + # del(self.drives[parent]) - self.udisks.EnumerateDevices(reply_handler=handle_reply, - error_handler=handle_error) + if callback: + callback() def _storage_bus(self, dev): storage_bus = None @@ -633,32 +634,26 @@ class LinuxLiveUSBCreator(LiveUSBCreator): raise LiveUSBError(_("Unsupported filesystem: %s") % self.fstype) self.dest = self.drive['mount'] + mnt = None if not self.dest: try: - self.log.debug("Calling %s.Mount('', %s, [], ...)" % ( - self.drive['udi'], self.fstype)) - dev = self._get_device(self.drive['udi']) - dev.FilesystemMount('', [], - dbus_interface='org.freedesktop.UDisks.Device') + dev = self._get_device_fs(self.drive['udi']) + self.log.debug("Mounting %s" % self.drive['device']) + bd = self.bus.get_object('org.freedesktop.UDisks2', + '/org/freedesktop/UDisks2/block_devices%s' % + self.drive['device'][4:]) + mnt = str(bd.Mount({}, dbus_interface='org.freedesktop.UDisks2.Filesystem')) except dbus.exceptions.DBusException, e: - if e.get_dbus_name() == \ - 'org.freedesktop.Hal.Device.Volume.AlreadyMounted': - self.log.debug(_('Device already mounted')) - else: - self.log.error(_('Unknown dbus exception while trying to ' - 'mount device: %s') % str(e)) + self.log.error(_('Unknown dbus exception while trying to ' + 'mount device: %s') % str(e)) except Exception, e: raise LiveUSBError(_("Unable to mount device: %r" % e)) - # Get the new mount point - udi = self.drive['udi'] - dev_obj = self.bus.get_object("org.freedesktop.UDisks", udi) - dev = dbus.Interface(dev_obj, "org.freedesktop.DBus.Properties") - mounts = map(unicode, list(dev.Get(udi, 'DeviceMountPaths'))) - if not mounts: + if not os.path.exists(mnt): self.log.error(_('No mount points found after mounting attempt')) + self.log.error("%s doesn't exist" % mnt) else: - self.dest = self.drive['mount'] = mounts[0] + self.dest = self.drive['mount'] = mnt self.drive['free'] = self.get_free_bytes(self.dest) / 1024**2 self.log.debug("Mounted %s to %s " % (self.drive['device'], self.dest)) @@ -787,11 +782,11 @@ class LinuxLiveUSBCreator(LiveUSBCreator): stat = os.statvfs(device) return stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL] - def _get_device(self, udi): + def _get_device_fs(self, udi): """ Return a dbus Interface to a specific UDisks device UDI """ import dbus - dev_obj = self.bus.get_object("org.freedesktop.UDisks", udi) - return dbus.Interface(dev_obj, "org.freedesktop.UDisks.Device") + dev_obj = self.bus.get_object("org.freedesktop.UDisks2", udi) + return dbus.Interface(dev_obj, "org.freedesktop.UDisks2.Filesystem") def terminate(self): for pid in self.pids: commit 1bc9210577cdb1e544768effad1c273b222cb02b Author: Luke Macken <lmacken(a)redhat.com> Date: Fri May 8 09:49:01 2015 -0600 docs: The logo is licensed under CC-BY-SA 4.0 Per the original author, Kushal Das. 11:32 lmacken> kushal: you made this, right? https://fedoraproject.org/wiki/Archive:Artwork/DesignService/Archive?rd=Art… -- debian folks are asking me about the license of the art 11:34 < kushal> | CC share alike 11:34 lmacken> kushal: cool, CC-BY-SA 3.0? 11:34 lmacken> https://creativecommons.org/licenses/by-sa/3.0/ 11:34 kushal> lmacken, you can choose one for me :) 11:35 kushal> lmacken, I am ok with your choice :) 11:35 lmacken> okay, I'll do the latest diff --git a/README.rst b/README.rst index 548704c..dd83b17 100644 --- a/README.rst +++ b/README.rst @@ -22,6 +22,8 @@ License The liveusb-creator is licensed under the GPLv2. +The liveusb-creator logo is licensed under the `CC-BY-SA 4.0 <https://creativecommons.org/licenses/by-sa/4.0/>`_ license. + This tool is distributed with the following open source software:: Python commit 97097c89c60f26a52a3e58c64eaf1aba3137cdf4 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Mar 19 11:52:44 2015 -0600 Fix the dimensions of the desktop icon (issue #17) diff --git a/data/fedorausb.png b/data/fedorausb.png index fe02c84..496707f 100644 Binary files a/data/fedorausb.png and b/data/fedorausb.png differ commit b6a608af7ea7eb090469d3605b6f8e4a9716dfd4 Merge: 5585fac 9a07f7d Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Mar 6 10:52:41 2015 -0700 Merge branch 'release/3.13.3' into develop

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

liveusb-creator May 2015