Merge branch 'master' into gui-feature

rupor-github · Jul 22, 2017 · 3b732b1 · 3b732b1
2 parents 8357c57 + fe6aa31
commit 3b732b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/synccovers.py b/synccovers.py
@@ -58,6 +58,9 @@ def process_folder(inputdir, width, height, stretch, verbose):
                 if os.path.isdir(kindle_dir):
                     print('Found Kindle thumbnails directory "{}"'.format(kindle_dir))
                     break
+            elif os.path.samefile(inputdir, head):
+                # Possibly trailing path separator, try again, without it
+                tail = head
         else:
             print('ERROR: unable to find Kindle system directory along the path "{0}"'.format(inputdir))
             sys.exit(-1)

diff --git a/version.py b/version.py
@@ -5,3 +5,4 @@
 WINDOWS = platform.system().lower() == "windows"
 
 VERSION = u'3.6.30'
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@
		WINDOWS = platform.system().lower() == "windows"

		VERSION = u'3.6.30'