|
Lines 2889-2894
Link Here
|
| 2889 |
show_blocker_docs_link() |
2889 |
show_blocker_docs_link() |
| 2890 |
return 1 |
2890 |
return 1 |
| 2891 |
|
2891 |
|
|
|
2892 |
if "--resume" in self.myopts: |
| 2893 |
# We're resuming. |
| 2894 |
print colorize("GOOD", "*** Resuming merge...") |
| 2895 |
emergelog(xterm_titles, " *** Resuming merge...") |
| 2896 |
mylist = mtimedb["resume"]["mergelist"][:] |
| 2897 |
if "--skipfirst" in self.myopts and mylist: |
| 2898 |
del mtimedb["resume"]["mergelist"][0] |
| 2899 |
del mylist[0] |
| 2900 |
mtimedb.commit() |
| 2901 |
validate_merge_list(self.trees, mylist) |
| 2902 |
mymergelist = mylist |
| 2903 |
|
| 2892 |
# Verify all the manifests now so that the user is notified of failure |
2904 |
# Verify all the manifests now so that the user is notified of failure |
| 2893 |
# as soon as possible. |
2905 |
# as soon as possible. |
| 2894 |
if "--fetchonly" not in self.myopts and \ |
2906 |
if "--fetchonly" not in self.myopts and \ |
|
Lines 2919-2935
Link Here
|
| 2919 |
|
2931 |
|
| 2920 |
#buildsyspkg: I need mysysdict also on resume (moved from the else block) |
2932 |
#buildsyspkg: I need mysysdict also on resume (moved from the else block) |
| 2921 |
mysysdict = genericdict(getlist(self.settings, "system")) |
2933 |
mysysdict = genericdict(getlist(self.settings, "system")) |
| 2922 |
if "--resume" in self.myopts: |
2934 |
if "--resume" not in self.myopts: |
| 2923 |
# We're resuming. |
|
|
| 2924 |
print colorize("GOOD", "*** Resuming merge...") |
| 2925 |
emergelog(xterm_titles, " *** Resuming merge...") |
| 2926 |
mymergelist=mtimedb["resume"]["mergelist"][:] |
| 2927 |
if "--skipfirst" in self.myopts and mymergelist: |
| 2928 |
del mtimedb["resume"]["mergelist"][0] |
| 2929 |
del mymergelist[0] |
| 2930 |
mtimedb.commit() |
| 2931 |
validate_merge_list(self.trees, mymergelist) |
| 2932 |
else: |
| 2933 |
myfavs = portage.grabfile( |
2935 |
myfavs = portage.grabfile( |
| 2934 |
os.path.join(self.target_root, portage.WORLD_FILE)) |
2936 |
os.path.join(self.target_root, portage.WORLD_FILE)) |
| 2935 |
myfavdict=genericdict(myfavs) |
2937 |
myfavdict=genericdict(myfavs) |
