[devscripts] 01/01: uscan: fix prioritizing mechanism of package files

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch master
in repository devscripts.

commit 4ec294f9a7d3521c17cdc7718ca24a11765179ad
Author: Osamu Aoki <osamu at debian.org>
Date:   Tue Jan 26 21:47:46 2016 +0900

    uscan: fix prioritizing mechanism of package files
    
    There were regressions and glitches in the prioritizing mechanism of
    packages.
    
    The new prioritizing mechanism of package files for the compression
    suffix adds the suffix to the upstream version as if it is a debian
    version and sorts the version with Devscripts::Versort::version instead
    of Devscripts::Versort::upstream_version.
    
    Devscripts::Versort::deb_version is not used here, since it checks
    sanity of the version.
    
    Git tag should be the upstream version.
    
    Closes: #809604, #812417
---
 debian/changelog |  5 +++++
 scripts/uscan.pl | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 723d09c..0655cb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,11 @@ devscripts (2.16.1) UNRELEASED; urgency=medium
   [ Christoph Berg ]
   * debcheckout: Add auth mapping for https://github.com.
 
+  [ Osamu Aoki ]
+  * uscan:
+    - Fix regressions and glitches in the prioritizing mechanism of packages.
+      (Closes: #809604, #812417)
+
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 05 Jan 2016 13:01:05 -0200
 
 devscripts (2.15.10) unstable; urgency=low
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 4507798..7ba11bf 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -2779,7 +2779,8 @@ sub process_watchline ($$$$$$)
     # Start Checking $site and look for $filepattern which is newer than $lastversion
     # What is the most recent file, based on the filenames?
     # We first have to find the candidates, then we sort them using
-    # Devscripts::Versort::upstream_versort
+    # Devscripts::Versort::upstream_versort (if it is real upstream version string) or
+    # Devscripts::Versort::versort (if it is suffixed upstream version string)
     if ($options{'mode'} eq 'git') {
 	# TODO: sanitize $base
 	uscan_verbose "Execute: git ls-remote $base\n";
@@ -2813,7 +2814,7 @@ sub process_watchline ($$$$$$)
 	    }
 	}
 	if (@refs) {
-	    @refs = Devscripts::Versort::versort(@refs);
+	    @refs = Devscripts::Versort::upstream_versort(@refs);
 	    my $msg = "Found the following matching refs:\n";
 	    foreach my $ref (@refs) {
 		$msg .= "     $$ref[1] ($$ref[0])\n";
@@ -2967,13 +2968,13 @@ sub process_watchline ($$$$$$)
 			    $match = "matched with the download version";
 			}
 		    }
-		    my $priority = $mangled_version . '.' . get_priority($href);
+		    my $priority = $mangled_version . '-' . get_priority($href);
 		    push @hrefs, [$priority, $mangled_version, $href, $match];
 		}
 	    }
 	}
 	if (@hrefs) {
-	    @hrefs = Devscripts::Versort::upstream_versort(@hrefs);
+	    @hrefs = Devscripts::Versort::versort(@hrefs);
 	    my $msg = "Found the following matching hrefs on the web page (newest first):\n";
 	    foreach my $href (@hrefs) {
 		$msg .= "   $$href[2] ($$href[1]) index=$$href[0] $$href[3]\n";
@@ -3052,7 +3053,7 @@ sub process_watchline ($$$$$$)
 			$match = "matched with the download version";
 		    }
 		}
-		my $priority = $mangled_version . '.' . get_priority($file);
+		my $priority = $mangled_version . '-' . get_priority($file);
 		push @files, [$priority, $mangled_version, $file, $match];
 	    }
 	} else {
@@ -3083,13 +3084,13 @@ sub process_watchline ($$$$$$)
 			    $match = "matched with the download version";
 			}
 		    }
-		    my $priority = $mangled_version . '.' . get_priority($file);
+		    my $priority = $mangled_version . '-' . get_priority($file);
 		    push @files, [$priority, $mangled_version, $file, $match];
 		}
 	    }
 	}
 	if (@files) {
-	    @files = Devscripts::Versort::upstream_versort(@files);
+	    @files = Devscripts::Versort::versort(@files);
 	    my $msg = "Found the following matching files on the web page (newest first):\n";
 	    foreach my $file (@files) {
 		$msg .= "   $$file[2] ($$file[1]) index=$$file[0] $$file[3]\n";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git