diff options
| author | Daniel Napora <napcok@gmail.com> | 2015-05-15 11:08:39 +0200 |
|---|---|---|
| committer | Daniel Napora <napcok@gmail.com> | 2015-05-15 11:08:39 +0200 |
| commit | fce72fcd307c6f0f2612523015907d3f4c2f844f (patch) | |
| tree | 82ab4916b861fbda1f95938924c5ab9b35fb9da8 | |
| parent | 7ee594f6bb93cfca0cc933a501ca94535534d040 (diff) | |
| download | mageiawelcome-fce72fcd307c6f0f2612523015907d3f4c2f844f.tar mageiawelcome-fce72fcd307c6f0f2612523015907d3f4c2f844f.tar.gz mageiawelcome-fce72fcd307c6f0f2612523015907d3f4c2f844f.tar.bz2 mageiawelcome-fce72fcd307c6f0f2612523015907d3f4c2f844f.tar.xz mageiawelcome-fce72fcd307c6f0f2612523015907d3f4c2f844f.zip | |
v. 0.8.19, opera removed
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | usr/share/mageiawelcome/apps.csv | 1 | ||||
| -rw-r--r-- | usr/share/mageiawelcome/mageiawelcome.py | 6 |
3 files changed, 5 insertions, 4 deletions
@@ -1,5 +1,5 @@ PACKAGE = mageiawelcome -VERSION = 0.8.18 +VERSION = 0.8.19 GITPATH = git://git.mageia.org/software/mageiawelcome TEXT_FILES = Makefile diff --git a/usr/share/mageiawelcome/apps.csv b/usr/share/mageiawelcome/apps.csv index 2727e4f..4f445e1 100644 --- a/usr/share/mageiawelcome/apps.csv +++ b/usr/share/mageiawelcome/apps.csv @@ -21,7 +21,6 @@ skype|get-skype|Skype|internet featured|Call, see, message and share with others filezilla|filezilla|Filezilla|internet|Full-featured graphical ftp/ftps/sftp client|filezilla|| firefox|firefox|Firefox|internet featured|Next generation web browser|firefox|| qbittorrent|qbittorrent|Qbittorrent|internet featured|Lightweight but feature rich bittorrent client|qbittorrent|| -opera|opera|Opera|internet|Fast and secure web browser and internet suite|opera|non-free| chromium|chromium-browser|Chromium|internet|Fast Webbrowser|chromium-browser|| amule|amule|Amule|internet|File sharing client compatible with eDonkey|amule|| thunderbird|thunderbird|Thunderbird|internet|E-mail, news and RSS client|thunderbird|| diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py index 089689b..bc1e0b7 100644 --- a/usr/share/mageiawelcome/mageiawelcome.py +++ b/usr/share/mageiawelcome/mageiawelcome.py @@ -43,7 +43,9 @@ def main(): os.chdir(dname) #collect sys info - release = open("/etc/release", "r").read() + #release = open("/etc/release", "r").read() + release = commands.getoutput('lsb_release -sd') + release = release[1:-1] kernel = commands.getoutput('uname -r') if os.uname()[4] == 'x86_64': arch = '64-bit' @@ -60,7 +62,7 @@ def main(): #collect packages nad its status listapp = get_listapp() - #check if non-free and tainted enabled + #TODO check if non-free and tainted enabled restricted_repos = "disabled" |