|
Lines 4663-4669
Link Here
|
| 4663 |
sys.stderr.write("\nThese are required by '--usepkgonly' -- Terminating.\n\n") |
4663 |
sys.stderr.write("\nThese are required by '--usepkgonly' -- Terminating.\n\n") |
| 4664 |
sys.exit(1) |
4664 |
sys.exit(1) |
| 4665 |
|
4665 |
|
| 4666 |
if "--ask" in myopts: |
4666 |
if True: |
| 4667 |
if "--resume" in myopts: |
4667 |
if "--resume" in myopts: |
| 4668 |
validate_merge_list(trees, mtimedb["resume"]["mergelist"]) |
4668 |
validate_merge_list(trees, mtimedb["resume"]["mergelist"]) |
| 4669 |
mymergelist = mtimedb["resume"]["mergelist"] |
4669 |
mymergelist = mtimedb["resume"]["mergelist"] |
|
Lines 4706-4718
Link Here
|
| 4706 |
else: |
4706 |
else: |
| 4707 |
prompt="Would you like to merge these packages?" |
4707 |
prompt="Would you like to merge these packages?" |
| 4708 |
print |
4708 |
print |
| 4709 |
if userquery(prompt)=="No": |
4709 |
if "--ask" in myopts and userquery(prompt) == "No": |
| 4710 |
print |
4710 |
print |
| 4711 |
print "Quitting." |
4711 |
print "Quitting." |
| 4712 |
print |
4712 |
print |
| 4713 |
sys.exit(0) |
4713 |
sys.exit(0) |
| 4714 |
# Don't ask again (e.g. when auto-cleaning packages after merge) |
4714 |
# Don't ask again (e.g. when auto-cleaning packages after merge) |
| 4715 |
del myopts["--ask"] |
4715 |
myopts.pop("--ask", None) |
| 4716 |
|
4716 |
|
| 4717 |
if ("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts): |
4717 |
if ("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts): |
| 4718 |
if ("--resume" in myopts): |
4718 |
if ("--resume" in myopts): |
