summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlnu <lnu@f70e237a-67f3-0310-a06c-d2b8a7116972>2006-05-02 12:35:50 +0000
committerlnu <lnu@f70e237a-67f3-0310-a06c-d2b8a7116972>2006-05-02 12:35:50 +0000
commitf26d914fb16bdcc2bc653e2d521eea1d5823f454 (patch)
treec17abe391746115dd47febd3e8e64d383ac787b8 /lib
parentd12cf64a0c104b6172f0aa6ba5cc282ec3a13149 (diff)
downloadfeed2imap-f26d914fb16bdcc2bc653e2d521eea1d5823f454.tar.gz
feed2imap-f26d914fb16bdcc2bc653e2d521eea1d5823f454.tar.bz2
feed2imap-f26d914fb16bdcc2bc653e2d521eea1d5823f454.zip
fixed flock on Solaris
git-svn-id: svn+ssh://svn.gna.org/svn/feed2imap/trunk/feed2imap@95 f70e237a-67f3-0310-a06c-d2b8a7116972
Diffstat (limited to 'lib')
-rw-r--r--lib/feed2imap/cache.rb2
-rw-r--r--lib/feed2imap/feed2imap.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/feed2imap/cache.rb b/lib/feed2imap/cache.rb
index cd75db2..9b5861f 100644
--- a/lib/feed2imap/cache.rb
+++ b/lib/feed2imap/cache.rb
@@ -132,7 +132,7 @@ class CachedChannel
for j in i+1...items.length do
if items[i].cacheditem == items[j].cacheditem
if UPDATEDDEBUG
- puts "## Removed #{items[j].cacheditem.to_s}"
+ puts "## Removed duplicate #{items[j].cacheditem.to_s}"
end
items.delete_at(j)
dups = true
diff --git a/lib/feed2imap/feed2imap.rb b/lib/feed2imap/feed2imap.rb
index 19d6ccd..68b94f0 100644
--- a/lib/feed2imap/feed2imap.rb
+++ b/lib/feed2imap/feed2imap.rb
@@ -66,7 +66,7 @@ class Feed2Imap
f = File::new(@config.cache + '.lock', 'w')
f.close
end
- if File::new(@config.cache + '.lock').flock(File::LOCK_EX | File::LOCK_NB) == false
+ if File::new(@config.cache + '.lock', 'w').flock(File::LOCK_EX | File::LOCK_NB) == false
@logger.fatal("Another instance of feed2imap is already locking the cache file")
exit(1)
end