diff --git a/PackageManager.py b/PackageManager.py index 40d20de..418828a 100755 --- a/PackageManager.py +++ b/PackageManager.py @@ -337,7 +337,7 @@ # GetAutoAddOk (class method) # SetAutoAddOk (class method) # AutoInstallOk (class method) -# UpdateDoNotInstall () +# SetAutoInstallOk () # InstallVersionCheck () # UpdateGitHubVersionClass # UpdateGitHubVersion (thread) @@ -1178,7 +1178,7 @@ def RemoveDbusService (self): # GetAutoAddOk (class method) # SetAutoAddOk (class method) # AutoInstallOk (class method) -# UpdateDoNotInstall () +# SetAutoInstallOk () # InstallVersionCheck () # # Globals: @@ -1262,10 +1262,10 @@ def SetAutoAddOk (cls, packageName, state): open (flagFile, 'a').close() - def UpdateDoNotInstall (self, state): + def SetAutoInstallOk (self, state): packageName = self.PackageName if packageName == None: - logging.error ("UpdateDoNotInstall - no packageName") + logging.error ("SetAutoInstallOk - no packageName") return # if package options directory exists set/clear auto install flag @@ -1659,9 +1659,11 @@ def AddPackage ( cls, packageName=None, gitHubUser=None, gitHubBranch=None, sour if source == 'GUI': DbusIf.SetGuiEditAction ( '' ) DbusIf.UpdateStatus ( message = "", where='Editor') - # package added from the GUI (aka, manually) - # allow auto adds - PackageClass.SetAutoAddOk (packageName, True) + + # allow auto adds and auto installs + PackageClass.SetAutoAddOk (packageName, True) + package.SetAutoInstallOk (True) + else: if source == 'GUI': DbusIf.UpdateStatus ( message=packageName + " already exists - choose another name", where=reportStatusTo, logLevel=WARNING ) @@ -2486,11 +2488,11 @@ def InstallPackage ( self, packageName=None, source=None , direction='install' ) sendStatusTo = 'Editor' # uninstall sets the uninstall flag file to prevent auto install if direction == 'uninstall': - package.UpdateDoNotInstall (False) + package.SetAutoInstallOk (True) logging.warning (packageName + " was manually uninstalled - auto install for that package will be skipped") # manual install removes the flag file else: - package.UpdateDoNotInstall (True) + package.SetAutoInstallOk (False) logging.warning (packageName + " was manually installed - allowing auto install for that package") elif source == 'AUTO': sendStatusTo = 'PmStatus' diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion index e5416ee..d064077 100644 --- a/blindInstall/SetupHelperVersion +++ b/blindInstall/SetupHelperVersion @@ -1 +1 @@ -v6.9 +v6.10 diff --git a/changes b/changes index 0467689..0e6b60f 100644 --- a/changes +++ b/changes @@ -1,3 +1,7 @@ +v6.10: + enable auto download and install after package add + previously, packagew would not auto install if uninstalled manually + v6.9: fixed: file uninstall fails if extracted from setup script removed PackageManager download delays diff --git a/venus-data-UninstallPackages.tgz b/venus-data-UninstallPackages.tgz index 8d5faae..8841410 100644 Binary files a/venus-data-UninstallPackages.tgz and b/venus-data-UninstallPackages.tgz differ diff --git a/venus-data.tgz b/venus-data.tgz index f2145d4..023075f 100644 Binary files a/venus-data.tgz and b/venus-data.tgz differ diff --git a/version b/version index e5416ee..d064077 100644 --- a/version +++ b/version @@ -1 +1 @@ -v6.9 +v6.10