Merge pull request #63 from darrenstahlmsft/ReparseModifiedTime

Only update directory modified times if not a reparse point

baselayer.go

@@ -75,18 +75,20 @@ func (w *baseLayerWriter) Add(name string, fileInfo *winio.FileBasicInfo) (err e
  return err
  }
  createmode = syscall.OPEN_EXISTING
- w.dirInfo = append(w.dirInfo, dirInfo{path, *fileInfo})
+ if fileInfo.FileAttributes&syscall.FILE_ATTRIBUTE_REPARSE_POINT == 0 {
+ w.dirInfo = append(w.dirInfo, dirInfo{path, *fileInfo})
+ }
  }
 
  mode := uint32(syscall.GENERIC_READ | syscall.GENERIC_WRITE | winio.WRITE_DAC | winio.WRITE_OWNER | winio.ACCESS_SYSTEM_SECURITY)
  f, err = winio.OpenForBackup(path, mode, syscall.FILE_SHARE_READ, createmode)
  if err != nil {
- return err
+ return makeError(err, "Failed to OpenForBackup", path)
  }
 
  err = winio.SetFileBasicInfo(f, fileInfo)
  if err != nil {
- return err
+ return makeError(err, "Failed to SetFileBasicInfo", path)
  }
 
  w.f = f
@@ -144,13 +146,13 @@ func (w *baseLayerWriter) Close() error {
  di := &w.dirInfo[len(w.dirInfo)-i-1]
  f, err := winio.OpenForBackup(di.path, uint32(syscall.GENERIC_READ|syscall.GENERIC_WRITE), syscall.FILE_SHARE_READ, syscall.OPEN_EXISTING)
  if err != nil {
- return err
+ return makeError(err, "Failed to OpenForBackup", di.path)
  }
 
  err = winio.SetFileBasicInfo(f, &di.fileInfo)
  f.Close()
  if err != nil {
- return err
+ return makeError(err, "Failed to SetFileBasicInfo", di.path)
  }
  }