# HG changeset patch
# User Riwad Salim
# Date 1530621406 -7200
# Node ID 564981c2e158530e19e26fdd78c3a6078cf1b9b9
# Parent  902a14596a56e0241e8ff90c4956197b23d6bca8# Parent  8ada2c99a2ecd74619f06e761ea295d32681d0fc
Merging divergent heads

diff -r 902a14596a56 -r 564981c2e158 .hgtags
--- a/.hgtags	Tue Jul 03 13:38:28 2018 +0200
+++ b/.hgtags	Tue Jul 03 14:36:46 2018 +0200
@@ -1,1 +1,2 @@
 1ffa3a81bdd90cf1a9faf6c9627dd012f0d57bf8 0.1
+279cf4baffeb3e8022f5de5ab31a77310ce7ffe2 0.1.1
diff -r 902a14596a56 -r 564981c2e158 data/script/scrapeso.py
--- a/data/script/scrapeso.py	Tue Jul 03 13:38:28 2018 +0200
+++ b/data/script/scrapeso.py	Tue Jul 03 14:36:46 2018 +0200
@@ -129,7 +129,9 @@
 
             infosdict['image']['imgurl'] = imgurl
             imgdirectory = directory + imgid
-        #if not os.path.exists(imgdirectory):
+            if os.path.exists(imgdirectory):
+                print("Problem processing %s, folder already exists with id %s " % (realurl, imgid))
+                continue
             os.mkdir(imgdirectory)
             imgdirection = imgdirectory + "/" + img
             urllib.request.urlretrieve(imgurl, imgdirection)
diff -r 902a14596a56 -r 564981c2e158 sbin/sync/requirements.txt
--- a/sbin/sync/requirements.txt	Tue Jul 03 13:38:28 2018 +0200
+++ b/sbin/sync/requirements.txt	Tue Jul 03 14:36:46 2018 +0200
@@ -1,2 +1,3 @@
 fabric
 requirements-parser
+blessings
\ No newline at end of file
diff -r 902a14596a56 -r 564981c2e158 src/iconolab_episteme/__init__.py
--- a/src/iconolab_episteme/__init__.py	Tue Jul 03 13:38:28 2018 +0200
+++ b/src/iconolab_episteme/__init__.py	Tue Jul 03 14:36:46 2018 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 1, 0, "final", 0)
+VERSION = (0, 1, 1, "final", 0)
 
 VERSION_STR = ".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))
 
diff -r 902a14596a56 -r 564981c2e158 src/setup.py
--- a/src/setup.py	Tue Jul 03 13:38:28 2018 +0200
+++ b/src/setup.py	Tue Jul 03 14:36:46 2018 +0200
@@ -123,7 +123,7 @@
         setup_requires=['setuptools_scm'],
         install_requires=[
             "Django >= 2.0",
-            "iconolab == 0.1.3",
+            "iconolab == 0.1.4",
             "django-appconf",
             "django-comments-xtd",
             "django-contrib-comments",