--- loncom/publisher/loncfile.pm 2011/11/14 00:20:31 1.114 +++ loncom/publisher/loncfile.pm 2012/06/04 19:23:41 1.115 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.114 2011/11/14 00:20:31 raeburn Exp $ +# $Id: loncfile.pm,v 1.115 2012/06/04 19:23:41 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -206,12 +206,13 @@ sub obsolete_unpub { # see if directory is empty # ignores any .meta, .save, .bak, and .log files created for a previously # published file, which has since been marked obsolete and deleted. +# ignores a .DS_Store file put there when viewing directory via webDAV on MacOS. sub empty_directory { my ($dirname,$phase) = @_; if (opendir DIR, $dirname) { my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and .. if (@files) { - my @orphans = grep(/\.(meta|save|log|bak)$/,@files); + my @orphans = grep(/\.(meta|save|log|bak|DS_Store)$/,@files); if (scalar(@files) - scalar(@orphans) > 0) { return 0; } else {