[php-apt-parser-maint] r23 - in /branches/des: ChangeLog parse-apt-files.inc

php-apt-parser-maint at lists.alioth.debian.org php-apt-parser-maint at lists.alioth.debian.org
Wed Feb 28 21:45:00 CET 2007


Author: dleidert-guest
Date: Wed Feb 28 21:44:59 2007
New Revision: 23

URL: http://svn.debian.org/wsvn/php-apt-parser/?sc=1&rev=23
Log:
* ChangeLog: Added missing entries for last change.
* parse-apt-files.inc:
  - Fixed bugs in the .build files search/link creation code
    introduced in revision 21 (1.3.1).
  - Reorganized the steps we do without further code-changes.
  - Added some information to the header comment.


Modified:
    branches/des/ChangeLog
    branches/des/parse-apt-files.inc

Modified: branches/des/ChangeLog
URL: http://svn.debian.org/wsvn/php-apt-parser/branches/des/ChangeLog?rev=23&op=diff
==============================================================================
--- branches/des/ChangeLog (original)
+++ branches/des/ChangeLog Wed Feb 28 21:44:59 2007
@@ -1,3 +1,17 @@
+2007-02-28  Daniel Leidert  <daniel.leidert at wgdd.de>, 1.3.2:
+	* ChangeLog: Added missing entries for last change.
+	* parse-apt-files.inc:
+	  - Fixed bugs in the .build files search/link creation code
+	    introduced in revision 21 (1.3.1).
+	  - Reorganized the steps we do without further code-changes.
+	  - Added some information to the header comment.
+
+2006-11-19  Daniel Leidert  <daniel.leidert at wgdd.de>, 1.3.1:
+	* parse-apt-files.inc:
+	  - Fixed Alioth bug #304143. I tried to read a non-existing field in
+	    Sources and it seems, this confused the script a bit.
+	    (http://alioth.debian.org/tracker/?func=detail&aid=304143&group_id=30953&atid=412507)
+
 2006-06-24  Damián Viano  <debian at damianv.com.ar>, 1.3.0:
 	* README: added info from parse-apt-files.inc, and mention to debarchiver
 	  specific usage

Modified: branches/des/parse-apt-files.inc
URL: http://svn.debian.org/wsvn/php-apt-parser/branches/des/parse-apt-files.inc?rev=23&op=diff
==============================================================================
--- branches/des/parse-apt-files.inc (original)
+++ branches/des/parse-apt-files.inc Wed Feb 28 21:44:59 2007
@@ -1,13 +1,19 @@
 <?php
     //////////////////////////////////////////////////////////////////
-    // PHP Apt-file parser, Version 1.3
+    // PHP Apt-file parser, Version 1.3.2
+    // $Id$
     //
     // The following PHP functions parse Debian APT-repository files
     // (Packages.gz, Sources.gz) and generate an XHTML summary of them.
     //
     // Written by Jarno Elonen in 2003, 2004
-    // Written by Daniel Leidert in 2005, 2006
+    // Written by Daniel Leidert in 2005-2007
     // Written by Damian Viano in 2006
+    //
+    // Visit or join us at
+    //   http://alioth.debian.org/projects/php-apt-parser.
+    //
+    // For licensing information see the LICENSE file.
     //
     //////////////////////////////////////////////////////////////////
 
@@ -175,7 +181,17 @@
 
 
             
-            // Figure out the most likely location for "changes" file.
+            // If sources are available, print out location.
+            if ( isset($srcfields["Directory"]) )
+            {
+                print "| <a href=\"" .
+                    htmlentities($base_url) .
+                    htmlentities($srcfields["Directory"]) .
+                    "\">Source dir</a>" . "\n";
+
+            }
+  
+            // Figure out the most likely location for ".changes" files.
             $changesdir = False;
             if ( $shared_changesdir !== False )
                 $changesdir = $shared_changesdir;
@@ -187,27 +203,6 @@
                 $changesdir = $changesdir["dirname"];
             }
 
-            $buildlogsdir = False;
-            if ( $shared_buildlogsdir !== False )
-                $buildlogsdir = $shared_buildlogsdir;
-            else if ( isset($srcfields["Directory"]) )
-                $buildlogsdir = $srcfields["Directory"];
-            else
-            {
-                $buildlogsdir = pathinfo($some_bin);
-                $buildlogsdir = $buildlogsdir["dirname"];
-            }
-
-            // If sources are available, print out location.
-            if ( isset($srcfields["Directory"]) )
-            {
-                print "| <a href=\"" .
-                    htmlentities($base_url) .
-                    htmlentities($srcfields["Directory"]) .
-                    "\">Source dir</a>" . "\n";
-
-            }
-  
             // Try to make a changes file link. This adds quite a bit
             // of disk access so if your server is very busy, you might
             // want to comment this out.
@@ -267,6 +262,18 @@
                 closedir($dhandle);
             }
 
+            // Figure out the most likely location for ".build" files.
+            $buildlogsdir = False;
+            if ( $shared_buildlogsdir !== False )
+                $buildlogsdir = $shared_buildlogsdir;
+            else if ( isset($srcfields["Directory"]) )
+                $buildlogsdir = $srcfields["Directory"];
+            else
+            {
+                $buildlogsdir = pathinfo($some_bin);
+                $buildlogsdir = $buildlogsdir["dirname"];
+            }
+
             // Try to make a build-log file link. This adds quite a bit
             // of disk access so if your server is very busy, you might
             // want to comment this out.
@@ -283,7 +290,8 @@
                         if ( strpos($file, $fields["Source"] . "_" .
                              preg_replace("/^[0-9]+\:/", "",
                              $fields["Version"])) !== False &&
-                             strpos($file, ".changes") !== False )
+                             strpos($file, ".build") !== False )
+                            $blfile = $file;
                     }
                     // If there is no Source-field, just try to use the
                     // Packages-field in Sources(.{gz,bz2}).
@@ -292,7 +300,8 @@
                         if ( strpos($file, $srcfields["Package"] . "_" .
                              preg_replace("/^[0-9]+\:/", "",
                              $fields["Version"])) !== False &&
-                             strpos($file, ".changes") !== False )
+                             strpos($file, ".build") !== False )
+                            $blfile = $file;
                     }
                     // And at least simply try the Package-field from
                     // Packages(.{gz,bz2}) for those packages, that do not have
@@ -302,7 +311,7 @@
                         if ( strpos($file, $fields["Package"] . "_" .
                              preg_replace("/^[0-9]+\:/", "",
                              $fields["Version"])) !== False &&
-                             strpos($file, ".changes") !== False )
+                             strpos($file, ".build") !== False )
                             $blfile = $file;
                     }
                     if ( $blfile !== False )




More information about the php-apt-parser-maint mailing list