|
Lines 7677-7689
Link Here
|
| 7677 |
# handy variables; mydest is the target object on the live filesystems; |
7677 |
# handy variables; mydest is the target object on the live filesystems; |
| 7678 |
# mysrc is the source object in the temporary install dir |
7678 |
# mysrc is the source object in the temporary install dir |
| 7679 |
try: |
7679 |
try: |
| 7680 |
mydmode = os.lstat(mydest).st_mode |
7680 |
mydstat = os.lstat(mydest) |
|
|
7681 |
mydmode = mydstat.st_mode |
| 7681 |
except OSError, e: |
7682 |
except OSError, e: |
| 7682 |
if e.errno != errno.ENOENT: |
7683 |
if e.errno != errno.ENOENT: |
| 7683 |
raise |
7684 |
raise |
| 7684 |
del e |
7685 |
del e |
| 7685 |
#dest file doesn't exist |
7686 |
#dest file doesn't exist |
| 7686 |
mydmode=None |
7687 |
mydstat = None |
|
|
7688 |
mydmode = None |
| 7687 |
|
7689 |
|
| 7688 |
if stat.S_ISLNK(mymode): |
7690 |
if stat.S_ISLNK(mymode): |
| 7689 |
# we are merging a symbolic link |
7691 |
# we are merging a symbolic link |
|
Lines 7803-7808
Link Here
|
| 7803 |
mydestdir=os.path.dirname(mydest) |
7805 |
mydestdir=os.path.dirname(mydest) |
| 7804 |
moveme=1 |
7806 |
moveme=1 |
| 7805 |
zing="!!!" |
7807 |
zing="!!!" |
|
|
7808 |
mymtime = None |
| 7806 |
if mydmode!=None: |
7809 |
if mydmode!=None: |
| 7807 |
# destination file exists |
7810 |
# destination file exists |
| 7808 |
if stat.S_ISDIR(mydmode): |
7811 |
if stat.S_ISDIR(mydmode): |
|
Lines 7826-7834
Link Here
|
| 7826 |
""" An identical update has previously been |
7829 |
""" An identical update has previously been |
| 7827 |
merged. Skip it unless the user has chosen |
7830 |
merged. Skip it unless the user has chosen |
| 7828 |
--noconfmem.""" |
7831 |
--noconfmem.""" |
| 7829 |
zing = "-o-" |
|
|
| 7830 |
moveme = cfgfiledict["IGNORE"] |
7832 |
moveme = cfgfiledict["IGNORE"] |
| 7831 |
cfgprot = cfgfiledict["IGNORE"] |
7833 |
cfgprot = cfgfiledict["IGNORE"] |
|
|
7834 |
if not moveme: |
| 7835 |
zing = "-o-" |
| 7836 |
mymtime = long(mydstat.st_mtime) |
| 7832 |
else: |
7837 |
else: |
| 7833 |
moveme = 1 |
7838 |
moveme = 1 |
| 7834 |
cfgprot = 1 |
7839 |
cfgprot = 1 |
