From: Michael Tremer Date: Mon, 13 Oct 2008 16:06:25 +0000 (+0200) Subject: General commit... see diff. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26d04920c351109cb1febdf716a6c41bea1b72cd;p=ipfire.org.git General commit... see diff. --- diff --git a/pakfire/show.py b/pakfire/show.py index 6a17605f..b460642b 100644 --- a/pakfire/show.py +++ b/pakfire/show.py @@ -71,40 +71,43 @@ def summurize_addons(): oldest="9999999999999" newest="0000000000000" for dir in os.listdir("version/"): -# print dir+"
" - for uuid in os.listdir("version/"+dir): -# print uuid+"
" - f = open("version/"+dir+"/"+uuid) - while True: - line = f.readline() - if len(line) == 0: - break # EOF - status = "" - pak = "" - command = "" - args = line.split(" ") - if oldest > args[1]: - oldest = args[1] - if newest < args[1]: - newest = args[1] - if len(args) > 2: - command = args[2] -# print command - if len(args) > 3: - pak = args[3] -# print pak - if len(args) > 4: - status = args[4] -# print status+"
" - if (status == "0\n") and (command == "installed") and (dir == "2.1"): - addons[pak] = addons.get(pak,0)+1 - installed[pak] = installed.get(pak,0)+1 - if (status == "0\n") and (command == "deleted") and (dir == "2.1"): - addons[pak] = addons.get(pak,0)-1 - deleted[pak] = deleted.get(pak,0)+1 - if (status == "0\n") and (command == "upgraded") and (dir == "2.1"): - upgraded[pak] = upgraded.get(pak,0)+1 - f.close() + if (dir == "empty.txt" ): + pass + else: + # print dir+"
" + for uuid in os.listdir("version/"+dir): + # print uuid+"
" + f = open("version/"+dir+"/"+uuid) + while True: + line = f.readline() + if len(line) == 0: + break # EOF + status = "" + pak = "" + command = "" + args = line.split(" ") + if oldest > args[1]: + oldest = args[1] + if newest < args[1]: + newest = args[1] + if len(args) > 2: + command = args[2] + # print command + if len(args) > 3: + pak = args[3] + # print pak + if len(args) > 4: + status = args[4] + # print status+"
" + if (status == "0\n") and (command == "installed") and (dir == "2.1" or dir == "2.3" ): + addons[pak] = addons.get(pak,0)+1 + installed[pak] = installed.get(pak,0)+1 + if (status == "0\n") and (command == "deleted") and (dir == "2.1" or dir == "2.3"): + addons[pak] = addons.get(pak,0)-1 + deleted[pak] = deleted.get(pak,0)+1 + if (status == "0\n") and (command == "upgraded") and (dir == "2.1" or dir == "2.3"): + upgraded[pak] = upgraded.get(pak,0)+1 + f.close() print "Oldest one installed - %s" % beautify_time(oldest) for x in range(10): print " " @@ -172,13 +175,20 @@ def summary(type): print "Summary" if type == "global": print "Versions available:", - print os.listdir("version/"), + for dir in os.listdir("version/"): + if (dir == "empty.txt" ): + pass + else: + print "%s
" % dir, print "" print "Number of total hosts:", count = 0 for dir in os.listdir("version/"): - count += len(os.listdir("version/"+dir)) + if (dir == "empty.txt" ): + pass + else: + count += len(os.listdir("version/"+dir)) print count, print "" @@ -203,14 +213,16 @@ print_header() summary("global") for dir in os.listdir("version/"): - - print "

%s

" % (os.environ['SCRIPT_NAME'], dir, dir) - if ver == dir: - for i in os.listdir("version/"+dir): - if i == uuid: - showdetails(i, dir) - else: - showuuid(i, dir) + if (dir == "empty.txt" ): + pass + else: + print "

%s

" % (os.environ['SCRIPT_NAME'], dir, dir) + if ver == dir: + for i in os.listdir("version/"+dir): + if i == uuid: + showdetails(i, dir) + else: + showuuid(i, dir) summurize_addons() diff --git a/www/de/downloads.shtml b/www/de/downloads.shtml index 50092aca..1762ab0b 100644 --- a/www/de/downloads.shtml +++ b/www/de/downloads.shtml @@ -96,8 +96,12 @@

- IPFire 2.3 - Beta3 -
+ IPFire 2.3 - Beta4 +   + MD5 +
+ IPFire 2.3 - Beta3 +
IPFire 2.3 - Beta2
IPFire 2.3 - Beta1 diff --git a/www/de/index.shtml b/www/de/index.shtml index ce6b8aed..60baf3f1 100644 --- a/www/de/index.shtml +++ b/www/de/index.shtml @@ -41,6 +41,31 @@
+
+ +

11. Oktober 2008 - IPFire 2.3 Beta 4

+
    +
  • Check it out
    • +
+ +

+ Sehr geehrte Community!
+ Heute wurde das vierte und wohl letzte Testversion von IPFire 2.3 veröffentlicht. +
+ Weitere Informationen und eine Diskussion sind im Forum zu finden: + Klick! +
+ Wir hoffen, dass viele Leute diese Version installieren und eine Menge Feedback geben, + damit wir mit einer gut getesteten Version in die Release Candidates gehen können. +
+
+ Maniac für das IPFire-Team +

+ +
+ +
+

25. August 2008 - Ein Jahr danach - IPFire 2.1

diff --git a/www/de/news.shtml b/www/de/news.shtml index 0c562e68..be61ad43 100644 --- a/www/de/news.shtml +++ b/www/de/news.shtml @@ -14,6 +14,7 @@ Auf dieser Seite findet ihr das News-Archiv des Projektes.

+ 11. Oktober 2008 - IPFire 2.3 Beta 4
25. August 2008 - Ein Jahr danach - IPFire 2.1
22. August 2008 - Projektvorstellung bei kbarthel.de
20. August 2008 - IPFire 2.3 Beta 3
@@ -23,6 +24,30 @@ 24. Juli 2008 - RSS Feed
08. November 2007 - IPFire 2.1 FINAL

+
+ +
+ +

11. Oktober 2008 - IPFire 2.3 Beta 4

+
    +
  • Check it out
    • +
+ +

+ Sehr geehrte Community!
+ Heute wurde das vierte und wohl letzte Testversion von IPFire 2.3 veröffentlicht. +
+ Weitere Informationen und eine Diskussion sind im Forum zu finden: + Klick! +
+ Wir hoffen, dass viele Leute diese Version installieren und eine Menge Feedback geben, + damit wir mit einer gut getesteten Version in die Release Candidates gehen können. +
+
+ Maniac für das IPFire-Team +

+ +

diff --git a/www/en/downloads.shtml b/www/en/downloads.shtml index e2f292c7..f4a9e290 100644 --- a/www/en/downloads.shtml +++ b/www/en/downloads.shtml @@ -94,8 +94,12 @@

- IPFire 2.3 - Beta3 -
+ IPFire 2.3 - Beta4 +   + MD5 +
+ IPFire 2.3 - Beta3 +
IPFire 2.3 - Beta2
IPFire 2.3 - Beta1 diff --git a/www/en/index.shtml b/www/en/index.shtml index f26a0d25..f6b3a32d 100644 --- a/www/en/index.shtml +++ b/www/en/index.shtml @@ -38,6 +38,31 @@
+
+ +

2008/10/11 - IPFire 2.3 Beta 4

+
    +
  • Check it out
    • +
+ +

+ Dear Community!
+ This day, we released the fourth beta version of IPFire 2.3. +
+ Further information and a discussion about that is to find in the forum: + Click! +
+ We hope that many of you will install this new version and give some feedback, so were able to have + a well tested version and go quickly forward to the Release Candidates. +
+
+ Maniac for the team of IPFire +

+ +
+ +
+

2008/08/25 - One year passed - IPFire 2.1

diff --git a/www/en/news.shtml b/www/en/news.shtml index a013e942..724f72e3 100644 --- a/www/en/news.shtml +++ b/www/en/news.shtml @@ -14,6 +14,7 @@ This is the news archive of ipfire.org.

+ 2008/10/11 - IPFire 2.3 Beta 4
2008/08/25 - One year passed - IPFire 2.1
2008/08/22 - Presentation of our project on kbarthel.de
2008/08/20 - IPFire 2.3 Beta 3
@@ -26,6 +27,31 @@
+

+ +

2008/10/11 - IPFire 2.3 Beta 4

+
    +
  • Check it out
    • +
+ +

+ Dear Community!
+ This day, we released the fourth beta version of IPFire 2.3. +
+ Further information and a discussion about that is to find in the forum: + Click! +
+ We hope that many of you will install this new version and give some feedback, so were able to have + a well tested version and go quickly forward to the Release Candidates. +
+
+ Maniac for the team of IPFire +

+ +
+ +
+

2008/08/25 - One year passed - IPFire 2.1