The way that the license hash_sha1 is computed in

exec/license prduces the exact same results as does
the UNIX tool sha1sum. This is a very decent thing
and would be accepted by me as the reference of
a license hash. Any other hash should be additive
to that first one.

The routine producing the license text from files
with the 'file LICENSE' did some changes to the
license text prior to forming the hash sum. This
was certainly meant well, but it also prohibited
the "cran2deb license hash" to work together with
"cran2deb build" in exceptional cases when there
are newlines too much or the when some text of
the license had a blank at the end of the line,
and donno when else.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@358 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

diff --git a/trunk/R/license.R b/trunk/R/license.R
index 977d84baa2f8be7eb7eb8be0061926d703d4eac8..b1af92239e7f38496cb63b5f108a7c5c1b7246b0 100644 (file)
--- a/trunk/R/license.R
+++ b/trunk/R/license.R
@@ -1,5 +1,8 @@
 is_acceptable_license <- function(license,verbose=FALSE,debug=FALSE) {
-    if (verbose) cat("is_acceptable_license: license:",license,"\n",sep="")
+    if (verbose) cat("is_acceptable_license: license: ",
+                       #paste(license,collapse="@",sep=""),
+                       license,
+                       "'\n",sep="")
     # determine if license text is acceptable
 
     if (length(grep('^file ',license))) {
@@ -102,47 +105,45 @@ license_text_hash_reduce <- function(text,verbose=TRUE) {
     return(chomp(tolower(gsub('[[:space:]]+',' ',text))))
 }
 
-get_license <- function(pkg,license) {
-    license <- chomp(gsub('[[:space:]]+',' ',license))
-    if (length(grep('^file ',license))) {
-        if (length(grep('^file LICEN[CS]E$',license))) {
-            file = gsub('file ','',license)
+get_license <- function(pkg,license,verbose=FALSE) {
+    license <- gsub('[[:space:]]+$',' ',license)
+    if (length(grep('^file\\s',license))) {
+        notice("License recognised as 'file'-based license.")
+        if (length(grep('^file\\s+LICEN[CS]E$',license))) {
+            file = gsub('file\\s+','',license)
             path = file.path(pkg$path, file)
             if (file.exists(path)) {
-                #license <- license_text_reduce(readChar(path,file.info(path)$size))
-                con <- file(path, "rb")
-                content <- paste(readLines(con), collapse="\n")
-                close(con)
-                license <- license_text_reduce(content)
+                license <- readChar(path,file.info(path)$size)
             } else {
                 path = file.path(pkg$path, 'inst', file)
                 if (file.exists(path)) {
-                    #license <- license_text_reduce(readChar(path,file.info(path)$size))
-                    con <- file(path, "rb")
-                    content <- paste(readLines(con), collapse="\n")
-                    close(con)
-                    license <- license_text_reduce(content)
+                    license <- readChar(path,file.info(path)$size)
                 } else {
-                    error('said to look at a license file but license file is missing')
+                    error(paste("Could not locate license file expected at '",
+                               path,"' or at '",
+                               file.path(pkg$path, file),"'.\n",sep=""))
                 }
             }
         } else {
-            error('invalid license file specification',license)
+            error("invalid license file specification, expected 'LICENSE' as filename, got: ",license)
             return(NA)
         }
     }
     return(license)
 }
 
-get_license_hash <- function(pkg,license) {
-    return(digest(get_license(pkg,license),algo='sha1',serialize=FALSE))
+get_license_hash <- function(pkg,license,verbose=FALSE) {
+    return(digest(get_license(pkg,license,verbose=verbose),algo='sha1',serialize=FALSE))
 }
 
-is_acceptable_hash_license <- function(pkg,license,verbose=TRUE) {
-    license_sha1 <- get_license_hash(pkg,license)
+is_acceptable_hash_license <- function(pkg,license,verbose=TRUE,debug=TRUE) {
+    if (debug) cat(paste("is_acceptable_hash_license: pkg$name='",pkg$name,"', license='",license,"'.\n",sep=""))
+    license_sha1 <- get_license_hash(pkg,license,verbose=verbose)
     if (is.null(license_sha1)) {
        if (verbose) cat("is_acceptable_hash_license: get_license_hash(pkg,license) returned NULL, returning FALSE.\n")
         return(FALSE)
+    } else if (verbose) {
+        notice(paste("is_acceptable_hash_license, license_sha1 determined: '",license_sha1,"'",sep=""))
     }
     action = db_license_override_hash(license_sha1)
     if (is.null(action)) {
@@ -162,7 +163,7 @@ is_acceptable_hash_license <- function(pkg,license,verbose=TRUE) {
 }
 
 
-accept_license <- function(pkg,verbose=FALSE) {
+accept_license <- function(pkg,verbose=TRUE) {
     # check the license
     if (!('License' %in% names(pkg$description[1,]))) {
         fail('package has no License: field in description!')
@@ -178,7 +179,7 @@ accept_license <- function(pkg,verbose=FALSE) {
         if (is_acceptable_license(l)) {
             accept=l
             break
-        } else if (is_acceptable_hash_license(pkg,l)) {
+        } else if (is_acceptable_hash_license(pkg,l,verbose=verbose)) {
             accept=l
             break
         } else {