Add information about error occurrence place

[goredo.git] / cleanup.go

diff --git a/cleanup.go b/cleanup.go
index 0f779972fd8d8dfe4d6dec453bb06e2372e733d4..26dbadce23b7540e6267a862acffd40176f4a628 100644 (file)
--- a/cleanup.go
+++ b/cleanup.go
@@ -51,7 +51,7 @@ func redoDirClean(root, what string) error {
        }
        dir, err := os.Open(root)
        if err != nil {
-               return err
+               return ErrLine(err)
        }
        defer dir.Close()
        for {
@@ -60,7 +60,7 @@ func redoDirClean(root, what string) error {
                        if err == io.EOF {
                                break
                        }
-                       return err
+                       return ErrLine(err)
                }
                var pth string
                for _, entry := range entries {
@@ -72,7 +72,7 @@ func redoDirClean(root, what string) error {
                                        fmt.Println(pth)
                                        if !*DryRun {
                                                if err = os.Remove(pth); err != nil {
-                                                       return err
+                                                       return ErrLine(err)
                                                }
                                        }
                                }
@@ -81,7 +81,7 @@ func redoDirClean(root, what string) error {
                                        fmt.Println(pth)
                                        if !*DryRun {
                                                if err = os.Remove(pth); err != nil {
-                                                       return err
+                                                       return ErrLine(err)
                                                }
                                        }
                                }
@@ -90,7 +90,7 @@ func redoDirClean(root, what string) error {
                                        fmt.Println(pth)
                                        if !*DryRun {
                                                if err = os.Remove(pth); err != nil {
-                                                       return err
+                                                       return ErrLine(err)
                                                }
                                        }
                                }
@@ -109,7 +109,7 @@ func cleanupWalker(root, what string) error {
        }
        dir, err := os.Open(root)
        if err != nil {
-               return err
+               return ErrLine(err)
        }
        defer dir.Close()
        for {
@@ -118,7 +118,7 @@ func cleanupWalker(root, what string) error {
                        if err == io.EOF {
                                break
                        }
-                       return err
+                       return ErrLine(err)
                }
                for _, entry := range entries {
                        pth := path.Join(root, entry.Name())
@@ -128,7 +128,7 @@ func cleanupWalker(root, what string) error {
                                        if what == CleanupFull {
                                                fmt.Println(pthRel)
                                                if !*DryRun {
-                                                       err = os.RemoveAll(pth)
+                                                       err = ErrLine(os.RemoveAll(pth))
                                                }
                                        } else {
                                                err = redoDirClean(pth, what)
@@ -137,7 +137,7 @@ func cleanupWalker(root, what string) error {
                                        strings.HasPrefix(entry.Name(), TmpPrefix) {
                                        fmt.Println(pthRel)
                                        if !*DryRun {
-                                               err = os.RemoveAll(pth)
+                                               err = ErrLine(os.RemoveAll(pth))
                                        }
                                } else {
                                        err = cleanupWalker(pth, what)
@@ -152,7 +152,7 @@ func cleanupWalker(root, what string) error {
                                fmt.Println(pthRel)
                                if !*DryRun {
                                        if err = os.Remove(pth); err != nil {
-                                               return err
+                                               return ErrLine(err)
                                        }
                                }
                        }