Author: arekm                        Date: Mon Feb 22 18:17:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Try to avoid matching ver with ver.tar.gz etc.

---- Files affected:
packages:
   pldnotify.awk (1.79 -> 1.80) 

---- Diffs:

================================================================
Index: packages/pldnotify.awk
diff -u packages/pldnotify.awk:1.79 packages/pldnotify.awk:1.80
--- packages/pldnotify.awk:1.79 Mon Feb 22 18:11:08 2010
+++ packages/pldnotify.awk      Mon Feb 22 19:17:02 2010
@@ -228,8 +228,7 @@
                if ( DEBUG ) print "Reading succeess response..."
                while (getline oneline < tmpfile)
                        wholeodp=(wholeodp " " oneline)
-               printf ""
-               if ( DEBUG ) print "Response: " wholeodp
+               # if ( DEBUG ) print "Response: " wholeodp
        } else {
                if ( DEBUG ) print "Reading failure response..."
                wholeerr = ""
@@ -379,13 +378,17 @@
        filename=url[4]
 
        if (index(dir,version)) {
+               # directory name as version maching mode:
+               # if /something/version/name-version.tarball then check
+               # in /something/ looking for newer directory
                dir=substr(dir,1,index(dir,version)-1)
                sub("[^/]*$","",dir)
                sub("(\.tar\.(bz|bz2|gz)|zip)$","",filename)
-               if ( DEBUG ) print "Will check a directory: " dir
-               if ( DEBUG ) print "and a file: " filename
        }
 
+       if ( DEBUG ) print "Will check a directory: " dir
+       if ( DEBUG ) print "and a file: " filename
+
        filenameexp=filename
        gsub("\+","\\+",filenameexp)
        sub(version,"[A-Za-z0-9.]+",filenameexp)
@@ -422,6 +425,8 @@
                                newfilename=fixedsub(postver,"",newfilename)
                                if (DEBUG) print "Version: " newfilename
                                if (newfilename ~ 
/\.(asc|sig|pkg|bin|binary|built)$/) continue
+                               # strip ending (happens when in directiory name 
as version matching mode)
+                               sub("(\.tar\.(bz|bz2|gz)|zip)$","",newfilename)
                                if (NUMERIC) {
                                        if ( compare_ver_dec(version, 
newfilename)==1 ) {
                                                if (DEBUG) print "Yes, there is 
new one"
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pldnotify.awk?r1=1.79&r2=1.80&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to