Andreas Enge <[email protected]> skribis:
> Am Mittwoch, 21. August 2013 schrieb Ludovic Courtès:
>> Commit db90b40 partially addresses this by removing the fake progress
>> report on Guile 2.0.5, and by printing “please wait” (and “please
>> upgrade”).
>>
>> Feedback from 2.0.5 users is welcome!
>
> As far as I can tell, nothing changed, I still get the progress report.
What do the following print?
guile -c '(use-modules (guix utils)) (pk (version>? (version) "2.0.5"))'
guile -c '(pk (version))'
My guess is that (version) return "2.0.5-foobar-deb", which defeats the
test above.
If that is the case, that patch should solve the problem:
diff --git a/guix/scripts/substitute-binary.scm b/guix/scripts/substitute-binary.scm
index 0fdec45..bfaebee 100755
--- a/guix/scripts/substitute-binary.scm
+++ b/guix/scripts/substitute-binary.scm
@@ -418,7 +418,10 @@ PORT. REPORT-PROGRESS is a two-argument procedure such as that returned by
;; Since `http-fetch' in Guile 2.0.5 returns all the data once it's done,
;; don't pretend to report any progress in that case.
- (if (version>? (version) "2.0.5")
+ (if (version>? (string-append (major-version) "."
+ (minor-version) "."
+ (micro-version))
+ "2.0.5")
(make-custom-binary-input-port "progress-port-proc"
read! #f #f
(cut close-port port))
Could you try and report back?
TIA,
Ludo’.
