|
Lines 6024-6038
Link Here
|
| 6024 |
# we are merging a directory |
6024 |
# we are merging a directory |
| 6025 |
if mydmode!=None: |
6025 |
if mydmode!=None: |
| 6026 |
# destination exists |
6026 |
# destination exists |
| 6027 |
if not os.access(mydest, os.W_OK): |
|
|
| 6028 |
pkgstuff = pkgsplit(self.pkg) |
| 6029 |
writemsg("\n!!! Cannot write to '"+mydest+"'.\n") |
| 6030 |
writemsg("!!! Please check permissions and directories for broken symlinks.\n") |
| 6031 |
writemsg("!!! You may start the merge process again by using ebuild:\n") |
| 6032 |
writemsg("!!! ebuild "+self.settings["PORTDIR"]+"/"+self.cat+"/"+pkgstuff[0]+"/"+self.pkg+".ebuild merge\n") |
| 6033 |
writemsg("!!! And finish by running this: env-update\n\n") |
| 6034 |
return 1 |
| 6035 |
|
| 6036 |
if S_ISLNK(mydmode) or S_ISDIR(mydmode): |
6027 |
if S_ISLNK(mydmode) or S_ISDIR(mydmode): |
| 6037 |
# a symlink to an existing directory will work for us; keep it: |
6028 |
# a symlink to an existing directory will work for us; keep it: |
| 6038 |
print "---",mydest+"/" |
6029 |
print "---",mydest+"/" |
|
Lines 6119-6126
Link Here
|
| 6119 |
if moveme: |
6110 |
if moveme: |
| 6120 |
mymtime=movefile(mysrc,mydest,thismtime,mystat, mysettings=self.settings) |
6111 |
mymtime=movefile(mysrc,mydest,thismtime,mystat, mysettings=self.settings) |
| 6121 |
if mymtime == None: |
6112 |
if mymtime == None: |
| 6122 |
sys.exit(1) |
6113 |
if os.path.basename(mydest)==".keep": |
| 6123 |
zing=">>>" |
6114 |
zing = "!!!" |
|
|
6115 |
else: |
| 6116 |
pkgstuff = pkgsplit(self.pkg) |
| 6117 |
writemsg("\n!!! Cannot write to '"+os.path.dirname(mydest)+"'.\n") |
| 6118 |
writemsg("!!! Please check permissions and directories for broken symlinks.\n") |
| 6119 |
writemsg("!!! You may start the merge process again by using ebuild:\n") |
| 6120 |
writemsg("!!! ebuild "+self.settings["PORTDIR"]+"/"+self.cat+"/"+pkgstuff[0]+"/"+self.pkg+".ebuild merge\n") |
| 6121 |
writemsg("!!! And finish by running this: env-update\n\n") |
| 6122 |
return 1 |
| 6123 |
else: |
| 6124 |
zing=">>>" |
| 6124 |
else: |
6125 |
else: |
| 6125 |
mymtime=thismtime |
6126 |
mymtime=thismtime |
| 6126 |
# We need to touch the destination so that on --update the |
6127 |
# We need to touch the destination so that on --update the |
