Merge branch 'develop' into 'master'

improvements

See merge request sulinos/devel/inary!41

inary/cli/checkrelation.py

@@ -71,6 +71,7 @@ Usage: check-relation
 
         installed.sort()
         need_reinstall = []
+        broken_packages=[]
 
         for pkg in installed:
             for p in self.installdb.get_package(pkg).runtimeDependencies():
@@ -78,9 +79,8 @@ Usage: check-relation
                 if not self.installdb.has_package(str(p.package)):
                     need_reinstall.append(p.package)
                     sys.stderr.write(
-                        _("Missing: - {}").format(p.package)+"\n")
-        self.fix_reinstall(need_reinstall)
-
+                        _("Missing: - {} : Needed by: - {}").format(p.package,pkg)+"\n")
+                    
         if self.options.force:
             for pkg in installed:
                 pkgname = pkg
@@ -91,4 +91,4 @@ Usage: check-relation
                         need_reinstall.append(pkg)
                         sys.stderr.write(
                             _("Missing: /{} - {}").format(f.path, pkg)+"\n")
-            self.fix_reinstall(need_reinstall)
+        self.fix_reinstall(need_reinstall)

inary/fetcher.py

@@ -269,7 +269,7 @@ class Fetcher:
         c.close()
 
     def _get_wget(self):
-        return os.system("timeout \"{}\" busybox wget -c --user-agent \"{}\"  \"{}\" -O \"{}\" 2>&1".format(self.timeout, self.useragent, self.url.get_uri(), self.partial_file))
+        return os.system("busybox wget -c --user-agent \"{}\"  \"{}\" -O \"{}\" 2>&1".format(self.useragent, self.url.get_uri(), self.partial_file))
 
     def _get_requests(self):
         from requests import get

inary/operations/build.py

@@ -703,9 +703,16 @@ class Builder:
         """Returns the real path of WorkDir for an unpacked archive."""
 
         dirname = self.get_action_variable("WorkDir", "")
+        src_list=os.listdir(self.pkg_work_dir())
+        if "inaryBuildState" in src_list:
+            src_list.remove("inaryBuildState")
         if dirname == "":
-            dirname = self.spec.source.name + "-" + self.spec.getSourceVersion()
+            if len(src_list)==1:
+                dirname = src_list[0]
+            else:
+                dirname = self.spec.source.name + "-" + self.spec.getSourceVersion()
         src_dir = util.join_path(self.pkg_work_dir(), dirname)
+        ctx.ui.info(_("WorkDir:{}".format(src_dir)))
         if not os.path.exists(src_dir):
             util.ensure_dirs(src_dir)
 

scripts/sulinstrapt

@@ -31,12 +31,11 @@ if echo $2 | grep "^-" &>/dev/null ; then
 	echo $2 | grep "n" && inary it NetworkManager -y --ignore-configure -D$sulin
 	echo $2 | grep "a" && inary it curl nano wget vim strace ntfsprogs tree dialog pfork scom htop -y --ignore-configure -D$sulin
 fi
-if [ ! -d $sulin/proc/sys/kernel ] ; then
-	for i in /dev /sys /proc /run
-	do
-		mkdir -p $sulin/$i &>/dev/null
-		mount --bind $i $sulin/$i
-	done
-fi
+for i in /dev /sys /proc /run
+do
+	mkdir -p $sulin/$i &>/dev/null
+	umount -lf -R $sulin/$i || true
+	mount --bind $i $sulin/$i
+done
 chroot $sulin inary cp baselayout
 chroot $sulin inary cp