diff options
Diffstat (limited to 'doIncoming.go')
| -rw-r--r-- | doIncoming.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/doIncoming.go b/doIncoming.go index 283cb64..f1b8cb9 100644 --- a/doIncoming.go +++ b/doIncoming.go @@ -24,13 +24,12 @@ func doIncoming(pb *zoopb.Packages) (string, error) { } if !info.IsDir() && strings.HasSuffix(info.Name(), ".deb") { - counter += 1 if found := me.pb.FindByFilename(path); found != nil { // log.Printf("not new file %s\n", path) - return nil + counter += 1 } newcount += 1 - if strings.HasPrefix(path, "pool/main/incoming") { + if strings.HasPrefix(path, "pool/main") { _, filename := filepath.Split(path) parts := strings.Split(filename, "_") if len(parts) != 3 { @@ -41,6 +40,10 @@ func doIncoming(pb *zoopb.Packages) (string, error) { packageName := parts[0] letteredDir := log.Sprintf("%1.1s", filename) newfilename := filepath.Join("pool/main", letteredDir, packageName, filename) + if newfilename == path { + // the filename is correct + return nil + } destDir := filepath.Dir(newfilename) if err := os.MkdirAll(destDir, 0755); err != nil { log.Printf("%s move incoming oldname %s newname: %s\n", packageName, path, newfilename) @@ -53,6 +56,8 @@ func doIncoming(pb *zoopb.Packages) (string, error) { oldmd5 := md5.Sum(olddata) newmd5 := md5.Sum(newdata) if oldmd5 == newmd5 { + log.Info("OLD FILE", path) + log.Info("NEW FILE", newfilename) log.Printf("files are the same %x %x\n", md5.Sum(olddata), md5.Sum(newdata)) } else { shell.RunVerbose([]string{"dpkg", "-I", path}) |