General commit... see diff.

diff --git a/pakfire/show.py b/pakfire/show.py
index 6a17605fc064aee87b1a2a263e69f12d1c219300..b460642b8126438d87f9e0b53fd3c8aac79eb7ca 100644 (file)
--- 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+"<br />"
-               for uuid in os.listdir("version/"+dir):
-#                      print uuid+"<br />"
-                       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+"<br />"
-                               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+"<br />"
+                       for uuid in os.listdir("version/"+dir):
+       #                       print uuid+"<br />"
+                               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+"<br />"
+                                       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 "&nbsp;"
@@ -172,13 +175,20 @@ def summary(type):
        print "<tr><td class='header' colspan='2'>Summary</td></tr>"
        if type == "global":
                print "<tr><td>Versions available:</td><td>",
-               print os.listdir("version/"),
+               for dir in os.listdir("version/"):
+                               if (dir == "empty.txt" ):
+                                  pass
+                               else:
+                                       print "%s<br>" % dir,
                print "</td></tr>"
                
                print "<tr><td>Number of total hosts:</td><td>",
                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 "</td></tr>"
 
@@ -203,14 +213,16 @@ print_header()
 summary("global")
 
 for dir in os.listdir("version/"):
-
-       print "<h2><a href='%s?ver=%s&amp;uuid='>%s</a></h2>" % (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 "<h2><a href='%s?ver=%s&amp;uuid='>%s</a></h2>" % (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 50092aca8cd367b79ea13dfee2cbb95241bdf700..1762ab0bfb4e91f248ba44cdd32cd5673a7618b3 100644 (file)
--- a/www/de/downloads.shtml
+++ b/www/de/downloads.shtml
@@ -96,8 +96,12 @@
                                        </p>
 
                                        <div align="right">
-                                                <a href="http://download.ipfire.org/iso/ipfire-2.3-beta3.i586-full.iso">IPFire 2.3 - Beta3</a>
-                                                <br />
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.3-beta4.i586-full.iso">IPFire 2.3 - Beta4</a>
+                                               &nbsp;
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.3-beta4.i586-full.md5">MD5</a>
+                                               <br />
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.3-beta3.i586-full.iso">IPFire 2.3 - Beta3</a>
+                                               <br />
                                                <a href="http://download.ipfire.org/iso/ipfire-2.3-beta2.i586-full.iso">IPFire 2.3 - Beta2</a>
                                                <br />
                                                <a href="http://download.ipfire.org/iso/ipfire-2.3-beta1.i586-full.iso">IPFire 2.3 - Beta1</a>

diff --git a/www/de/index.shtml b/www/de/index.shtml
index ce6b8aed1daeb56425fb10ca9b32cbf2bb9944df..60baf3f18ba45b14138ab5cc5b79e388dd12b88d 100644 (file)
--- a/www/de/index.shtml
+++ b/www/de/index.shtml
@@ -41,6 +41,31 @@
 
                                <br class="clear" />
 
+                               <div class="post">
+                                       <a name="news-09"></a>
+                                       <h3>11. Oktober 2008 - IPFire 2.3 Beta 4</h3>
+                                       <ul class="post_info">
+                                               <li class="date">Check it out</li>
+                                       </ul>
+
+                                       <p>
+                                               <b>Sehr geehrte Community!</b><br />
+                                               Heute wurde das vierte und wohl letzte Testversion von IPFire 2.3 veröffentlicht.
+                                               <br />
+                                               Weitere Informationen und eine Diskussion sind im Forum zu finden:
+                                               <a href="http://forum.ipfire.org/index.php/topic,783.0.html" target="_blank">Klick!</a>
+                                               <br />
+                                               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.
+                                               <br />
+                                               <br />
+                                               Maniac für das IPFire-Team
+                                       </p>
+
+                               </div>
+
+                               <br class="clear" />
+
                                <div class="post">
                                        <a name="news-08"></a>
                                        <h3>25. August 2008 - Ein Jahr danach - IPFire 2.1</h3>

diff --git a/www/de/news.shtml b/www/de/news.shtml
index 0c562e68ccf84fe734d55857a451d7748d5927e1..be61ad4377cc376880bb65d95710a7e172f652ff 100644 (file)
--- a/www/de/news.shtml
+++ b/www/de/news.shtml
@@ -14,6 +14,7 @@
                                        Auf dieser Seite findet ihr das News-Archiv des Projektes.
                                </p>
                                <p>
+                                       <a href="#news-09">11. Oktober 2008 - IPFire 2.3 Beta 4</a><br />
                                        <a href="#news-08">25. August 2008 - Ein Jahr danach - IPFire 2.1</a><br />
                                        <a href="#news-07">22. August 2008 - Projektvorstellung bei kbarthel.de</a><br />
                                        <a href="#news-06">20. August 2008 - IPFire 2.3 Beta 3</a><br />
@@ -23,6 +24,30 @@
                                        <a href="#news-02">24. Juli 2008 - RSS Feed</a><br />
                                        <a href="#news-01">08. November 2007 - IPFire 2.1 FINAL</a>
                                </p>
+                               <br class="clear" />
+
+                               <div class="post">
+                                       <a name="news-09"></a>
+                                       <h3>11. Oktober 2008 - IPFire 2.3 Beta 4</h3>
+                                       <ul class="post_info">
+                                               <li class="date">Check it out</li>
+                                       </ul>
+
+                                       <p>
+                                               <b>Sehr geehrte Community!</b><br />
+                                               Heute wurde das vierte und wohl letzte Testversion von IPFire 2.3 veröffentlicht.
+                                               <br />
+                                               Weitere Informationen und eine Diskussion sind im Forum zu finden:
+                                               <a href="http://forum.ipfire.org/index.php/topic,783.0.html" target="_blank">Klick!</a>
+                                               <br />
+                                               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.
+                                               <br />
+                                               <br />
+                                               Maniac für das IPFire-Team
+                                       </p>
+
+                               </div>
 
                                <br class="clear" />
 

diff --git a/www/en/downloads.shtml b/www/en/downloads.shtml
index e2f292c7c723edc476c685474552404100ac49e1..f4a9e290028e3d54e9db6e2798aae6f1bdcf90a5 100644 (file)
--- a/www/en/downloads.shtml
+++ b/www/en/downloads.shtml
@@ -94,8 +94,12 @@
                                        </p>
 
                                        <div align="right">
-                                                <a href="http://download.ipfire.org/iso/ipfire-2.3-beta3.i586-full.iso">IPFire 2.3 - Beta3</a>
-                                                <br />
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.3-beta4.i586-full.iso">IPFire 2.3 - Beta4</a>
+                                               &nbsp;
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.3-beta4.i586-full.md5">MD5</a>
+                                               <br />
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.3-beta3.i586-full.iso">IPFire 2.3 - Beta3</a>
+                                               <br />
                                                <a href="http://download.ipfire.org/iso/ipfire-2.3-beta2.i586-full.iso">IPFire 2.3 - Beta2</a>
                                                <br />
                                                <a href="http://download.ipfire.org/iso/ipfire-2.3-beta1.i586-full.iso">IPFire 2.3 - Beta1</a>

diff --git a/www/en/index.shtml b/www/en/index.shtml
index f26a0d2554da3f02d2f05f9a033d57c27449047d..f6b3a32d4693a61084a8d11367d01a6c7d29df51 100644 (file)
--- a/www/en/index.shtml
+++ b/www/en/index.shtml
@@ -38,6 +38,31 @@
 
                                <br class="clear" />
 
+                               <div class="post">
+                                       <a name="news-09"></a>
+                                       <h3>2008/10/11 - IPFire 2.3 Beta 4</h3>
+                                       <ul class="post_info">
+                                               <li class="date">Check it out</li>
+                                       </ul>
+
+                                       <p>
+                                               <b>Dear Community!</b><br />
+                                               This day, we released the fourth beta version of IPFire 2.3.
+                                               <br />
+                                               Further information and a discussion about that is to find in the forum:
+                                               <a href="http://forum.ipfire.org/index.php/topic,783.0.html" target="_blank">Click!</a>
+                                               <br />
+                                               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.
+                                               <br />
+                                               <br />
+                                               Maniac for the team of IPFire
+                                       </p>
+
+                               </div>
+
+                               <br class="clear" />
+
                                <div class="post">
                                        <a name="news-08"></a>
                                        <h3>2008/08/25 - One year passed - IPFire 2.1</h3>

diff --git a/www/en/news.shtml b/www/en/news.shtml
index a013e942c3fe6b4d91df6d4b5bfc98a89e218540..724f72e301c84ae5700cce499fbc9662c511d818 100644 (file)
--- a/www/en/news.shtml
+++ b/www/en/news.shtml
@@ -14,6 +14,7 @@
                                        This is the news archive of ipfire.org.
                                </p>
                                <p>
+                                       <a href="#news-09">2008/10/11 - IPFire 2.3 Beta 4</a><br />
                                        <a href="#news-08">2008/08/25 - One year passed - IPFire 2.1</a><br />
                                        <a href="#news-07">2008/08/22 - Presentation of our project on kbarthel.de</a><br />
                                        <a href="#news-06">2008/08/20 - IPFire 2.3 Beta 3</a><br />
@@ -26,6 +27,31 @@
 
                                <br class="clear" />
 
+                               <div class="post">
+                                       <a name="news-09"></a>
+                                       <h3>2008/10/11 - IPFire 2.3 Beta 4</h3>
+                                       <ul class="post_info">
+                                               <li class="date">Check it out</li>
+                                       </ul>
+
+                                       <p>
+                                               <b>Dear Community!</b><br />
+                                               This day, we released the fourth beta version of IPFire 2.3.
+                                               <br />
+                                               Further information and a discussion about that is to find in the forum:
+                                               <a href="http://forum.ipfire.org/index.php/topic,783.0.html" target="_blank">Click!</a>
+                                               <br />
+                                               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.
+                                               <br />
+                                               <br />
+                                               Maniac for the team of IPFire
+                                       </p>
+
+                               </div>
+
+                               <br class="clear" />
+
                                <div class="post">
                                        <a name="news-08"></a>
                                        <h3>2008/08/25 - One year passed - IPFire 2.1</h3>