|
Lines 12033-12040
def action_sync(settings, trees, mtimedb, myopts, myaction):
Link Here
|
| 12033 |
out = portage.output.EOutput() |
12033 |
out = portage.output.EOutput() |
| 12034 |
|
12034 |
|
| 12035 |
myportdir = settings.get("PORTDIR", None) |
12035 |
myportdir = settings.get("PORTDIR", None) |
|
|
12036 |
sync_method = settings.get("SYNC_METHOD", "").strip() |
| 12036 |
syncuri = settings.get("SYNC", "").strip() |
12037 |
syncuri = settings.get("SYNC", "").strip() |
| 12037 |
|
12038 |
|
|
|
12039 |
if not sync_method: |
| 12040 |
writemsg_level("!!! SYNC_METHOD is undefined. Is /etc/make.globals missing?\n", |
| 12041 |
noiselevel=-1, level=logging.ERROR) |
| 12042 |
return 1 |
| 12043 |
|
| 12038 |
if not syncuri: |
12044 |
if not syncuri: |
| 12039 |
writemsg_level("!!! SYNC is undefined. Is /etc/make.globals missing?\n", |
12045 |
writemsg_level("!!! SYNC is undefined. Is /etc/make.globals missing?\n", |
| 12040 |
noiselevel=-1, level=logging.ERROR) |
12046 |
noiselevel=-1, level=logging.ERROR) |
|
Lines 12086-12092
def action_sync(settings, trees, mtimedb, myopts, myaction):
Link Here
|
| 12086 |
if myaction == "metadata": |
12092 |
if myaction == "metadata": |
| 12087 |
print "skipping sync" |
12093 |
print "skipping sync" |
| 12088 |
updatecache_flg = True |
12094 |
updatecache_flg = True |
| 12089 |
elif ".git" in vcs_dirs: |
12095 |
elif sync_method == "git": |
| 12090 |
# Update existing git repository, and ignore the syncuri. We are |
12096 |
# Update existing git repository, and ignore the syncuri. We are |
| 12091 |
# going to trust the user and assume that the user is in the branch |
12097 |
# going to trust the user and assume that the user is in the branch |
| 12092 |
# that he/she wants updated. We'll let the user manage branches with |
12098 |
# that he/she wants updated. We'll let the user manage branches with |
|
Lines 12114-12120
def action_sync(settings, trees, mtimedb, myopts, myaction):
Link Here
|
| 12114 |
exitcode = git_sync_timestamps(settings, myportdir) |
12120 |
exitcode = git_sync_timestamps(settings, myportdir) |
| 12115 |
if exitcode == os.EX_OK: |
12121 |
if exitcode == os.EX_OK: |
| 12116 |
updatecache_flg = True |
12122 |
updatecache_flg = True |
| 12117 |
elif syncuri[:8]=="rsync://": |
12123 |
elif sync_method == "rsync": |
| 12118 |
for vcs_dir in vcs_dirs: |
12124 |
for vcs_dir in vcs_dirs: |
| 12119 |
writemsg_level(("!!! %s appears to be under revision " + \ |
12125 |
writemsg_level(("!!! %s appears to be under revision " + \ |
| 12120 |
"control (contains %s).\n!!! Aborting rsync sync.\n") % \ |
12126 |
"control (contains %s).\n!!! Aborting rsync sync.\n") % \ |
|
Lines 12450-12456
def action_sync(settings, trees, mtimedb, myopts, myaction):
Link Here
|
| 12450 |
for line in msg: |
12456 |
for line in msg: |
| 12451 |
out.eerror(line) |
12457 |
out.eerror(line) |
| 12452 |
sys.exit(exitcode) |
12458 |
sys.exit(exitcode) |
| 12453 |
elif syncuri[:6]=="cvs://": |
12459 |
elif sync_method == "cvs": |
| 12454 |
if not os.path.exists("/usr/bin/cvs"): |
12460 |
if not os.path.exists("/usr/bin/cvs"): |
| 12455 |
print "!!! /usr/bin/cvs does not exist, so CVS support is disabled." |
12461 |
print "!!! /usr/bin/cvs does not exist, so CVS support is disabled." |
| 12456 |
print "!!! Type \"emerge dev-util/cvs\" to enable CVS support." |
12462 |
print "!!! Type \"emerge dev-util/cvs\" to enable CVS support." |
