Changeset 4053 for lliurex-up
- Timestamp:
- Mar 28, 2017, 2:45:28 PM (4 years ago)
- Location:
- lliurex-up/trunk/fuentes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-up/trunk/fuentes/lliurex-up-cli/usr/sbin/lliurex-upgrade
r3783 r4053 74 74 #def clientCheckingMirrorIsRunning 75 75 76 def initActionsScript(self ):76 def initActionsScript(self,extra_args): 77 77 78 78 print(" [Lliurex-up]: Checking system") 79 80 command=self.lliurexcore.initActionsScript(self.initActionsArg) 79 80 if extra_args["unattendend_upgrade"]: 81 command="DEBIAN_FRONTEND=noninteractive " + self.lliurexcore.initActionsScript(self.initActionsArg) 82 83 else: 84 command=self.lliurexcore.initActionsScript(self.initActionsArg) 81 85 82 86 try: … … 250 254 #def checkPreviousUpgrade 251 255 252 def preActionsScript(self ):256 def preActionsScript(self,extra_args): 253 257 254 258 print(" [Lliurex-up]: Preparing system to update") 255 259 256 command=self.lliurexcore.preActionsScript() 260 if extra_args["unattendend_upgrade"]: 261 command="DEBIAN_FRONTEND=noninteractive " + self.lliurexcore.preActionsScript() 262 else: 263 command=self.lliurexcore.preActionsScript() 264 257 265 try: 258 266 #os.system(command) … … 268 276 #def preActionsScript 269 277 270 def distUpgrade(self ):278 def distUpgrade(self,extra_args): 271 279 272 280 print(" [Lliurex-up]: Downloading and installing packages") 273 281 274 command=self.lliurexcore.distUpgradeProcess() 282 if extra_args["unattendend_upgrade"]: 283 command="DEBIAN_FRONTEND=noninteractive " + self.lliurexcore.distUpgradeProcess() 284 else: 285 command=self.lliurexcore.distUpgradeProcess() 286 275 287 try: 276 288 #os.system(command) … … 278 290 log_msg="Exec Dist-uggrade" 279 291 self.log(log_msg) 292 280 293 except Exception as e: 281 294 log_msg="Exec Dist-uggrade.Error : " +str(e) … … 285 298 #def distUpgrade 286 299 287 def postActionsScript(self ):300 def postActionsScript(self,extra_args): 288 301 289 302 print(" [Lliurex-up]: Ending the update") 290 command=self.lliurexcore.postActionsScript()+'| tee ' + self.lliurexcore.errorpostaction_token 303 304 if extra_args["unattendend_upgrade"]: 305 command="DEBIAN_FRONTEND=noninteractive " + self.lliurexcore.postActionsScript()+'| tee ' + self.lliurexcore.errorpostaction_token 306 else: 307 command=self.lliurexcore.postActionsScript()+'| tee ' + self.lliurexcore.errorpostaction_token 308 291 309 try: 292 310 subprocess.Popen(command,shell=True).communicate() … … 394 412 return 1 395 413 396 self.initActionsScript( )414 self.initActionsScript(extra_args) 397 415 self.checkLliurexUp() 398 416 … … 415 433 416 434 if response.startswith('y'): 417 self.preActionsScript( )418 self.distUpgrade( )419 self.postActionsScript( )435 self.preActionsScript(extra_args) 436 self.distUpgrade(extra_args) 437 self.postActionsScript(extra_args) 420 438 self.checkingFinalFlavourToInstall() 421 439 self.checkFinalUpgrade() -
lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/LliurexUpConnect.py
r3717 r4053 78 78 79 79 arg="initActions" 80 command= self.llxUpCore.initActionsScript(arg)80 command="DEBIAN_FRONTEND=gnome DEBIAN_PRIORITY=high " + self.llxUpCore.initActionsScript(arg) 81 81 82 82 try: -
lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/lliurex-up.py
r3741 r4053 589 589 if self.initactions_process_t.done: 590 590 if self.can_connect: 591 is_mirror_running_inserver=self.llxup_connect.clientCheckingMirrorIsRunning()592 if is_mirror_running_inserver==False:591 #is_mirror_running_inserver=self.llxup_connect.clientCheckingMirrorIsRunning() 592 if self.is_mirror_running_inserver==False: 593 593 594 594 if not self.check_lliurexup_t.is_alive() and not self.check_lliurexup_t.launched: … … 730 730 self.can_connect=self.llxup_connect.canConnectToLliurexNet() 731 731 if self.can_connect: 732 self.is_mirror_running_inserver=self.llxup_connect.clientCheckingMirrorIsRunning() 732 733 self.llxup_connect.initActionsScript() 734 733 735 self.initactions_process_t.done=True 734 736 -
lliurex-up/trunk/fuentes/python-lliurex-up/lliurex/lliurexup/__init__.py
r3735 r4053 270 270 ''' 271 271 self.updateCacheApt(options) 272 command = "LANG=C LANGUAGE=en apt-get install --force-yes --yes lliurex-up {options}".format(options=options)272 command = "LANG=C LANGUAGE=en DEBIAN_FRONTEND=noninteractive apt-get install --force-yes --yes lliurex-up {options}".format(options=options) 273 273 p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE) 274 274 poutput,perror = p.communicate() … … 439 439 ''' 440 440 self.updateCacheApt(options) 441 command = "LANG=C LANGUAGE=en apt-get install --force-yes --yes " + flavourToInstall + "{options} ".format(options=options)441 command = "LANG=C LANGUAGE=en DEBIAN_FRONTEND=noninteractive apt-get install --force-yes --yes " + flavourToInstall + "{options} ".format(options=options) 442 442 p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE) 443 443 poutput,perror = p.communicate()
Note: See TracChangeset
for help on using the changeset viewer.