summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--usr/share/mageiawelcome/apps.csv1
-rw-r--r--usr/share/mageiawelcome/mageiawelcome.py6
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d09343e..a41e90a 100644
--- a/Makefile
+++ b/Makefile
@@ -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"