From 9a34309e3d859a653e63202e4668aea3d1e31a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 27 Oct 2010 13:58:44 +0400 Subject: [PATCH] Fix script for run --update. Fix wirte step_system. --- pym/cl_assemble.py | 5 ++--- scripts/cl-assemble | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py index 5d673af..9286896 100644 --- a/pym/cl_assemble.py +++ b/pym/cl_assemble.py @@ -382,7 +382,7 @@ class cl_assemble(color_print): if path.exists(pathAppMisc) and \ filter(lambda x:metaPackage in x, os.listdir(pathAppMisc)): self._prepareMount() - self.writeVar('cl_assemble_step_system','2') + self.writeVar('cl_assemble_step_system','0') return True if not isinstance(self.sourceDistr,IsoDistributive): self._unpackPortage() @@ -436,8 +436,7 @@ class cl_assemble(color_print): comment="added by Calculate for p2p", shell="/bin/bash",prefix=self.assemblePath) - if isinstance(self.sourceDistr,IsoDistributive): - self.writeVar('cl_assemble_step_system','0') + self.writeVar('cl_assemble_step_system','0') return True return False diff --git a/scripts/cl-assemble b/scripts/cl-assemble index 1be1b52..e0768fa 100644 --- a/scripts/cl-assemble +++ b/scripts/cl-assemble @@ -55,6 +55,9 @@ if __name__ == "__main__": if options.c: if not assemble.configureSystem(options.f,options.no_unmount): sys.exit(1) + if options.u: + if not assemble.updateSystem(options.f): + sys.exit(1) if options.m: if not assemble.compileSystem(options.f): sys.exit(1)