|
Lines 1463-1469
Link Here
|
| 1463 |
const std::string &alias_r ) |
1463 |
const std::string &alias_r ) |
| 1464 |
{ |
1464 |
{ |
| 1465 |
// parse URL |
1465 |
// parse URL |
| 1466 |
y2milestone ("Original URL: %s", url_r.asString().c_str()); |
1466 |
y2milestone ("Original URL: %s, product directory: %s", url_r.asString().c_str(), path_r.asString().c_str()); |
| 1467 |
|
1467 |
|
| 1468 |
// #158850#c17, if the URL contains an alias, we use that |
1468 |
// #158850#c17, if the URL contains an alias, we use that |
| 1469 |
zypp::Url url; |
1469 |
zypp::Url url; |
|
Lines 1494-1503
Link Here
|
| 1494 |
// the type is not specified or is wrong, autoprobe the type |
1494 |
// the type is not specified or is wrong, autoprobe the type |
| 1495 |
if (repotype == zypp::repo::RepoType::NONE) |
1495 |
if (repotype == zypp::repo::RepoType::NONE) |
| 1496 |
{ |
1496 |
{ |
| 1497 |
y2milestone("Probing source type: '%s'", url.asString().c_str()); |
1497 |
zypp::Url probe_url(url_r); |
| 1498 |
|
1498 |
|
|
|
1499 |
if (!path_r.asString().empty()) |
| 1500 |
{ |
| 1501 |
zypp::Pathname pth(probe_url.getPathName()); |
| 1502 |
pth /= path_r; |
| 1503 |
|
| 1504 |
probe_url.setPathName(pth.asString()); |
| 1505 |
} |
| 1506 |
|
| 1507 |
y2milestone("Probing source type: '%s'", probe_url.asString().c_str()); |
| 1508 |
|
| 1499 |
// autoprobe type of the repository |
1509 |
// autoprobe type of the repository |
| 1500 |
repotype = ProbeWithCallbacks(url); |
1510 |
repotype = ProbeWithCallbacks(probe_url); |
| 1501 |
} |
1511 |
} |
| 1502 |
|
1512 |
|
| 1503 |
y2milestone("Using source type: %s", repotype.asString().c_str()); |
1513 |
y2milestone("Using source type: %s", repotype.asString().c_str()); |
|
Lines 1591-1597
Link Here
|
| 1591 |
zypp::Pathname metadatapath = repomanager.metadataPath(repo); |
1601 |
zypp::Pathname metadatapath = repomanager.metadataPath(repo); |
| 1592 |
repo.setMetadataPath(metadatapath); |
1602 |
repo.setMetadataPath(metadatapath); |
| 1593 |
|
1603 |
|
| 1594 |
y2milestone("Adding source '%s' (%s)", repo.alias().c_str(), url.asString().c_str()); |
1604 |
y2milestone("Adding source '%s' (%s, dir: %s)", repo.alias().c_str(), url.asString().c_str(), path_r.asString().c_str()); |
| 1595 |
// note: exceptions should be caught by the calling code |
1605 |
// note: exceptions should be caught by the calling code |
| 1596 |
RefreshWithCallbacks(repo); |
1606 |
RefreshWithCallbacks(repo); |
| 1597 |
|
1607 |
|