1818def versioncheck (package , url , version , verbose = 0 ):
1919 ok , newversion , fp = checkonly (package , url , version , verbose )
2020 if verbose > VERBOSE_NORMAL :
21- return ok
21+ return ok
2222 if ok < 0 :
23- print '%s: No correctly formatted current version file found' % (package )
23+ print '%s: No correctly formatted current version file found' % (package )
2424 elif ok == 1 :
25- print '%s: up-to-date (version %s)' % (package , version )
25+ print '%s: up-to-date (version %s)' % (package , version )
2626 else :
27- print '%s: version %s installed, version %s found:' % \
28- (package , version , newversion )
29- if verbose > VERBOSE_SILENT :
30- while 1 :
31- line = fp .readline ()
32- if not line : break
33- sys .stdout .write ('\t ' + line )
27+ print '%s: version %s installed, version %s found:' % \
28+ (package , version , newversion )
29+ if verbose > VERBOSE_SILENT :
30+ while 1 :
31+ line = fp .readline ()
32+ if not line : break
33+ sys .stdout .write ('\t ' + line )
3434 return ok
35-
35+
3636def checkonly (package , url , version , verbose = 0 ):
3737 if verbose >= VERBOSE_EACHFILE :
38- print '%s:' % package
38+ print '%s:' % package
3939 if type (url ) == types .StringType :
40- ok , newversion , fp = _check1version (package , url , version , verbose )
40+ ok , newversion , fp = _check1version (package , url , version , verbose )
4141 else :
42- for u in url :
43- ok , newversion , fp = _check1version (package , u , version , verbose )
44- if ok >= 0 and verbose < VERBOSE_CHECKALL :
45- break
42+ for u in url :
43+ ok , newversion , fp = _check1version (package , u , version , verbose )
44+ if ok >= 0 and verbose < VERBOSE_CHECKALL :
45+ break
4646 return ok , newversion , fp
47-
47+
4848def _check1version (package , url , version , verbose = 0 ):
4949 if verbose >= VERBOSE_EACHFILE :
50- print ' Checking %s' % url
50+ print ' Checking %s' % url
5151 try :
52- fp = urllib .urlopen (url )
52+ fp = urllib .urlopen (url )
5353 except IOError , arg :
54- if verbose >= VERBOSE_EACHFILE :
55- print ' Cannot open:' , arg
56- return - 1 , None , None
54+ if verbose >= VERBOSE_EACHFILE :
55+ print ' Cannot open:' , arg
56+ return - 1 , None , None
5757 msg = rfc822 .Message (fp , seekable = 0 )
5858 newversion = msg .getheader ('current-version' )
5959 if not newversion :
60- if verbose >= VERBOSE_EACHFILE :
61- print ' No "Current-Version:" header in URL or URL not found'
62- return - 1 , None , None
60+ if verbose >= VERBOSE_EACHFILE :
61+ print ' No "Current-Version:" header in URL or URL not found'
62+ return - 1 , None , None
6363 version = string .strip (string .lower (version ))
6464 newversion = string .strip (string .lower (newversion ))
6565 if version == newversion :
66- if verbose >= VERBOSE_EACHFILE :
67- print ' Version identical (%s)' % newversion
68- return 1 , version , fp
66+ if verbose >= VERBOSE_EACHFILE :
67+ print ' Version identical (%s)' % newversion
68+ return 1 , version , fp
6969 else :
70- if verbose >= VERBOSE_EACHFILE :
71- print ' Versions different (installed: %s, new: %s)' % \
72- (version , newversion )
73- return 0 , newversion , fp
74-
75-
70+ if verbose >= VERBOSE_EACHFILE :
71+ print ' Versions different (installed: %s, new: %s)' % \
72+ (version , newversion )
73+ return 0 , newversion , fp
74+
75+
7676def _test ():
7777 print '--- TEST VERBOSE=1'
7878 print '--- Testing existing and identical version file'
@@ -96,6 +96,6 @@ def _test():
9696 versioncheck ('VersionTestPackage' , versfiles , '1.0' , verbose = 2 )
9797
9898if __name__ == '__main__' :
99- _test ()
99+ _test ()
100100
101101
0 commit comments