src_prepare/euscan-ng
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

euscan: misc fixes

Browse Source 
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
This commit is contained in:
Corentin Chary
2012-08-15 11:04:29 +02:00
parent 88b15c18d2
commit bbfcc3d6d5
10 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pym/euscan/handlers/berlios.py
View File

@ -12,7 +12,7 @@ CONFIDENCE = 90
PRIORITY = 90
berlios_regex = r"berlios.de/([^/]+)/([^/]+)"
berlios_regex = r"mirror://berlios/([^/]+)/([^/]+)"
def can_handle(pkg, url=None):

4
pym/euscan/handlers/google_code.py
View File

@ -32,6 +32,6 @@ def scan_url(pkg, url, options):
result = url_scan(pkg, base_url, file_pattern)
ret = []
for found_url, pv, _, _ in result:
ret.append((found_url, pv, HANDLER_NAME, CONFIDENCE))
for url, pv, _, _ in result:
ret.append((url, pv, HANDLER_NAME, CONFIDENCE))
return ret

8
pym/euscan/handlers/sourceforge.py
View File

@ -12,7 +12,7 @@ PRIORITY = 90
def can_handle(pkg, url=None):
return url and "sourceforge.net/" in url
return url and "mirror://sourceforge/" in url
def scan_url(pkg, url, options):
@ -20,7 +20,7 @@ def scan_url(pkg, url, options):
cp, ver, rev = portage.pkgsplit(pkg.cpv)
project, filename = re.search("sourceforge.net/([^/]+)/(?:.*/)?([^/]+)",
project, filename = re.search("mirror://sourceforge/([^/]+)/(?:.*/)?([^/]+)",
url).groups()
base_url = "http://qa.debian.org/watch/sf.php/%s" % project
file_pattern = regex_from_template(
@ -30,6 +30,6 @@ def scan_url(pkg, url, options):
result = url_scan(pkg, base_url, file_pattern)
ret = []
for found_url, pv, _, _ in result:
ret.append((found_url, pv, HANDLER_NAME, CONFIDENCE))
for url, pv, _, _ in result:
ret.append((url, pv, HANDLER_NAME, CONFIDENCE))
return ret

12
pym/euscan/scan.py
View File

@ -54,8 +54,6 @@ def parse_src_uri(uris):
if '://' not in uri:
continue
if 'mirror://' in uri:
uri = from_mirror(uri)
if uris and uris[-1] == "->":
operator = uris.pop()
@ -102,7 +100,7 @@ def scan_upstream(query, on_progress=None):
else:
matches = Query(query).find(
include_masked=True,
in_installed=False
in_installed=False,
)
if not matches:
@ -165,9 +163,13 @@ def scan_upstream(query, on_progress=None):
uris = pkg.environment('SRC_URI')
cpv = pkg.cpv
urls = parse_src_uri(uris)
versions = handlers.scan(pkg, urls, on_progress)
uris = parse_src_uri(uris)
uris_expanded = [ from_mirror(uri) if 'mirror://' in uri else uri for uri in uris ]
pkg._uris = uris
pkg._uris_expanded = uris_expanded
versions = handlers.scan(pkg, uris, on_progress)
cp, ver, rev = portage.pkgsplit(pkg.cpv)