|
Lines 2645-2653
Link Here
|
| 2645 |
maxretries=3 #default number of retries |
2645 |
maxretries=3 #default number of retries |
| 2646 |
|
2646 |
|
| 2647 |
retries=0 |
2647 |
retries=0 |
| 2648 |
hostname, port=re.split("rsync://([^:/]*)(:[0-9]+)?", syncuri)[1:3]; |
2648 |
user_name, hostname, port=re.split("rsync://([^:/]+@)?([^:/]*)(:[0-9]+)?", syncuri)[1:4] |
| 2649 |
if port is None: |
2649 |
if port is None: |
| 2650 |
port="" |
2650 |
port="" |
|
|
2651 |
if user_name is None: |
| 2652 |
user_name="" |
| 2651 |
updatecache_flg=True |
2653 |
updatecache_flg=True |
| 2652 |
all_rsync_opts = set(rsync_opts) |
2654 |
all_rsync_opts = set(rsync_opts) |
| 2653 |
all_rsync_opts.update( |
2655 |
all_rsync_opts.update( |
|
Lines 2679-2685
Link Here
|
| 2679 |
|
2681 |
|
| 2680 |
if ips: |
2682 |
if ips: |
| 2681 |
try: |
2683 |
try: |
| 2682 |
dosyncuri=string.replace(syncuri, "//"+hostname+port+"/", "//"+ips[0]+port+"/", 1) |
2684 |
dosyncuri=string.replace(syncuri, "//"+user_name+hostname+port+"/", "//"+user_name+ips[0]+port+"/", 1) |
| 2683 |
except SystemExit, e: |
2685 |
except SystemExit, e: |
| 2684 |
raise # Needed else can't exit |
2686 |
raise # Needed else can't exit |
| 2685 |
except Exception, e: |
2687 |
except Exception, e: |
