Conflicts:
etc/bootstrap.conf
mic/bootstrap.py
mic/creator.py
mic/imager/raw.py
mic/msger.py
mic/utils/misc.py
setup.py
Signed-off-by: Gui Chen <gui.chen@intel.com>
import subprocess
import platform
import rpmmisc
+import hashlib
+import sqlite3 as sqlite
- from xml.etree import cElementTree
+ try:
+ import sqlite3 as sqlite
+ except ImportError:
+ import sqlite
+
+ try:
+ from xml.etree import cElementTree
+ except ImportError:
+ import cElementTree
xmlparse = cElementTree.parse
from errors import *
else:
etc_prefix = os.path.join(prefix, 'etc')
-conffile = 'distfiles/mic.conf'
+conffile = 'etc/mic.conf'
- bsconf = 'etc/bootstrap.conf'
if os.path.isfile('%s/mic/mic.conf' % etc_prefix):
conffile += '.new'