[154455]
raimue at macports.org
raimue at macports.org
Sun Oct 30 01:06:26 CEST 2016
Revision: 154455
https://trac.macports.org/changeset/154455
Author: raimue at macports.org
Date: 2016-10-30 01:06:26 +0200 (Sun, 30 Oct 2016)
Log Message:
-----------
merge r154451 from trunk:
sync: warn on obsolete Subversion repository
Conflicts resolved during merge.
Revision Links:
--------------
https://trac.macports.org/changeset/154451
Modified Paths:
--------------
branches/release_2_3/base/src/macports1.0/macports.tcl
Property Changed:
----------------
branches/release_2_3/base/
branches/release_2_3/base/src/
Index: branches/release_2_3/base
===================================================================
--- branches/release_2_3/base 2016-10-29 23:02:53 UTC (rev 154454)
+++ branches/release_2_3/base 2016-10-29 23:06:26 UTC (rev 154455)
Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,6 ##
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
-/trunk/base:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135998-135999,136965,137850,138461,138530,138749,139270,140693,140724,141134,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447,152676,153648,153865,153932,154073,154110,154184
+/trunk/base:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135998-135999,136965,137850,138461,138530,138749,139270,140693,140724,141134,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447,152676,153648,153865,153932,154073,154110,154184,154451
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
\ No newline at end of property
Index: branches/release_2_3/base/src
===================================================================
--- branches/release_2_3/base/src 2016-10-29 23:02:53 UTC (rev 154454)
+++ branches/release_2_3/base/src 2016-10-29 23:06:26 UTC (rev 154455)
Property changes on: branches/release_2_3/base/src
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,6 ##
/branches/gsoc13-tests/src:106692-111324
/branches/universal-sanity/base/src:51872-52323
/branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
-/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,145037,145162,146644,147347,147456,148084,149299,150305,152115,152442,152447,153648,153865
+/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,145037,145162,146644,147347,147456,148084,149299,150305,152115,152442,152447,153648,153865,154451
/users/perry/base-bugs_and_notes/src:45682-46060
/users/perry/base-select/src:44044-44692
\ No newline at end of property
Modified: branches/release_2_3/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_3/base/src/macports1.0/macports.tcl 2016-10-29 23:02:53 UTC (rev 154454)
+++ branches/release_2_3/base/src/macports1.0/macports.tcl 2016-10-29 23:06:26 UTC (rev 154455)
@@ -2232,6 +2232,25 @@
return 0
}
+##
+# Checks whether a local source directory is a checkout of the obsolete Subversion repository
+#
+# @param source_dir local directory check
+proc _source_is_obsolete_svn_repo {source_dir} {
+ if {![catch {macports::findBinary svn} svn] &&
+ ([file exists ${source_dir}/.svn] ||
+ ![catch {exec $svn info ${source_dir} >/dev/null 2>@1}])
+ } then {
+ if {![catch {exec $svn info ${source_dir}} svninfo]} {
+ if {[regexp -line {^Repository Root: https://svn\.macports\.org/repository/macports} $svninfo] ||
+ [regexp -line {^Repository UUID: d073be05-634f-4543-b044-5fe20cf6d1d6$} $svninfo]} {
+ return 1
+ }
+ }
+ }
+ return 0
+}
+
proc macports::getportbuildpath {id {portname {}}} {
global macports::portdbpath
regsub {://} $id {.} port_path
@@ -2274,6 +2293,7 @@
}
set numfailed 0
+ set obsoletesvn 0
ui_msg "$macports::ui_prefix Updating the ports tree"
foreach source $sources {
@@ -2288,6 +2308,9 @@
switch -regexp -- [macports::getprotocol $source] {
{^file$} {
set portdir [macports::getportdir $source]
+ if {[_source_is_obsolete_svn_repo $portdir]} {
+ set obsoletesvn 1
+ }
set svn_cmd {}
catch {set svn_cmd [macports::findBinary svn]}
set git_cmd {}
@@ -2590,6 +2613,11 @@
if {$numfailed > 0} {
return -code error "Synchronization of $numfailed source(s) failed"
}
+
+ if {$obsoletesvn != 0} {
+ ui_warn "The Subversion repository at svn.macports.org is no longer updated."
+ ui_warn "Please switch to Git: https://trac.macports.org/wiki/howto/SyncingWithGit"
+ }
}
##
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161030/a5b299a9/attachment-0002.html>
More information about the macports-changes
mailing list