Changeset 23

Timestamp:

20/02/2007 17:09:28 (2 years ago)

Author:

nextime

Message:

--

Files:

• packages/main/dupload/trunk/dupload (modified) (3 diffs)

packages/main/dupload/trunk/dupload

@@ -464 +464 @@
-} elsif ($method eq "rsync") {
-        p "Uploading (rsync) to $host ($fqdn)\n";
+} elsif ($method eq "cp") {
+        p "Copying (cp) to $incoming\n";
-} else {
-        fatal("Unknown upload method\n");
@@ -547 +549 @@
-                        $t = 1;
-                        $batchmode = 1;
+                } elsif ($method eq "cp") {
+                        $mode = (stat($file))[2];
+                        unless ($dry) {
+                                system("cp -p $options $file $incoming");
+                                fatal("cp $file failed\n") if $?;
+                                $t = time() - $t;
+                                # Small optimization
+                                if ($mode != 33188) { # rw-r--r-- aka 0644
+                                    system("chmod 0644 $incoming/$file");
+                                    fatal("chmod 0644 failed\n") if $?;
+                                }
+                        } else {
+                                p "\n+ cp -p $options $file $incoming";
+                                if ($mode != 33188) { # rw-r--r-- aka 0644
+                                     p "\n+ chmod 0644 $incoming/$file";
+                                }
+                                $t = 1;
+                        }
-                }
-
@@ -568 +588 @@
-                                        p "\n+ ssh -x -l $login $fqdn \"mv $incoming$file $queuedir$file\"";
-                                }
+                        } elsif ($method eq "cp") {
+                                unless ($dry) {
+                                        system("mv $incoming$file $queuedir$file");
+                                        fatal("mv failed\n") if $?;
+                                } else {
+                                        p "\n+ mv $incoming$file $queuedir$file";
+                                }
-                        }
-                }