/[meta-cvs]/meta-cvs/F-255EFD9E99EDDE6614CF2CD912CA4E5C
ViewVC logotype

Diff of /meta-cvs/F-255EFD9E99EDDE6614CF2CD912CA4E5C

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.14 by kaz, Tue Mar 12 19:54:58 2002 UTC revision 1.15 by kaz, Tue Mar 12 21:00:19 2002 UTC
# Line 21  Line 21 
21            (mapping-rename-files filemap dir-expansion source base)            (mapping-rename-files filemap dir-expansion source base)
22            (mapping-rename-files filemap dir-expansion dir dest-dir))            (mapping-rename-files filemap dir-expansion dir dest-dir))
23          (mapping-rename-files filemap dir-expansion source          (mapping-rename-files filemap dir-expansion source
24                                        (path-cat dest-dir base))))))                                (canonicalize-path(path-cat dest-dir base)))))))
25    
26  (defun move-guts (filemap sources destination)  (defun move-guts (filemap sources destination)
27    (let* ((two-args (null (second sources)))    (let* ((two-args (null (second sources)))
28             (destination-trailing-slash (string= (char destination
29                                                        (1- (length destination)))
30                                                  *path-sep*))
31           (destination-file-object (no-existence-error (stat destination)))           (destination-file-object (no-existence-error (stat destination)))
32           (destination-file-exists (or (mapping-lookup filemap destination)           (destination-file-exists (or (mapping-lookup filemap destination)
33                                        (and destination-file-object                                        (and destination-file-object
# Line 33  Line 36 
36           (destination-dir-exists (and (not destination-file-exists)           (destination-dir-exists (and (not destination-file-exists)
37                                        (or (mapping-prefix-lookup filemap                                        (or (mapping-prefix-lookup filemap
38                                                                   destination)                                                                   destination)
39                                            (directory-p                                            (directory-p destination-file-object)
40                                             destination-file-object)))))                                            destination-trailing-slash))))
41      (if two-args      (if two-args
42        (if destination-dir-exists        (if destination-dir-exists
43          (simple-move-to-dir filemap (first sources) destination)          (simple-move-to-dir filemap (first sources) destination)

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15

  ViewVC Help
Powered by ViewVC 1.1.5