diff -Nru metpx-sarracenia-2.21.03~ubuntu20.10.1/debian/changelog metpx-sarracenia-2.21.04~ubuntu20.10.1/debian/changelog --- metpx-sarracenia-2.21.03~ubuntu20.10.1/debian/changelog 2021-03-12 00:06:28.000000000 +0000 +++ metpx-sarracenia-2.21.04~ubuntu20.10.1/debian/changelog 2021-04-17 08:25:05.000000000 +0000 @@ -1,8 +1,16 @@ -metpx-sarracenia (2.21.03~ubuntu20.10.1) groovy; urgency=low +metpx-sarracenia (2.21.04~ubuntu20.10.1) groovy; urgency=low * Auto build. - -- Supercomputing @ Government of Canada Fri, 12 Mar 2021 00:06:28 +0000 + -- Supercomputing @ Government of Canada Sat, 17 Apr 2021 08:25:05 +0000 + +metpx-sarracenia (2.21.04) stable; urgency=medium + + * bugfix for regression, failure to use BASIC authentication on https sites. + * bugfix running on windows... again for #47, but not resolving #47 + * bugfix... problem reported in #47, but not resolving #47. + + -- Peter Silva Sat, 20 Mar 2021 23:14:34 -0400 metpx-sarracenia (2.21.03) stable; urgency=medium diff -Nru metpx-sarracenia-2.21.03~ubuntu20.10.1/debian/git-build-recipe.manifest metpx-sarracenia-2.21.04~ubuntu20.10.1/debian/git-build-recipe.manifest --- metpx-sarracenia-2.21.03~ubuntu20.10.1/debian/git-build-recipe.manifest 2021-03-12 00:06:28.000000000 +0000 +++ metpx-sarracenia-2.21.04~ubuntu20.10.1/debian/git-build-recipe.manifest 2021-04-17 08:25:05.000000000 +0000 @@ -1,2 +1,2 @@ # git-build-recipe format 0.4 deb-version {debupstream} -lp:~ssc-hpc-chp-spc/metpx-sarracenia/+git/trunk git-commit:359d47c67a5704bccf0fb6ef31b1a18550634db0 +lp:~ssc-hpc-chp-spc/metpx-sarracenia/+git/trunk git-commit:2c681faea21069f9323f3fba01c2855dc9c09e77 diff -Nru metpx-sarracenia-2.21.03~ubuntu20.10.1/doc/UPGRADING.rst metpx-sarracenia-2.21.04~ubuntu20.10.1/doc/UPGRADING.rst --- metpx-sarracenia-2.21.03~ubuntu20.10.1/doc/UPGRADING.rst 2021-03-12 00:06:27.000000000 +0000 +++ metpx-sarracenia-2.21.04~ubuntu20.10.1/doc/UPGRADING.rst 2021-04-17 08:25:05.000000000 +0000 @@ -36,6 +36,16 @@ git --- +2.21.04 +------- + +fixes regression, from previous release. + +2.21.03 +------- + +*BUG* does not retrieve from web sites with passwords (https BASIC authentication broken) + 2.20.07 ------- diff -Nru metpx-sarracenia-2.21.03~ubuntu20.10.1/generate-win-installer.sh metpx-sarracenia-2.21.04~ubuntu20.10.1/generate-win-installer.sh --- metpx-sarracenia-2.21.03~ubuntu20.10.1/generate-win-installer.sh 2021-03-12 00:06:27.000000000 +0000 +++ metpx-sarracenia-2.21.04~ubuntu20.10.1/generate-win-installer.sh 2021-04-17 08:25:05.000000000 +0000 @@ -7,10 +7,11 @@ cd pynsist_pkgs/ # Ensure to download only windows binaries +pip3 download pynacl --only-binary=:all: --platform win_amd64 pip3 download amqp --only-binary=:all: --platform win_amd64 pip3 download appdirs --only-binary=:all: --platform win_amd64 +#pip3 download netifaces-w38 --only-binary=:all: --platform win_amd64 pip3 download netifaces --only-binary=:all: --platform win_amd64 -pip3 download pika --only-binary=:all: --platform win_amd64 pip3 download psutil --only-binary=:all: --platform win_amd64 pip3 download paramiko --only-binary=:all: --platform win_amd64 diff -Nru metpx-sarracenia-2.21.03~ubuntu20.10.1/sarra/__init__.py metpx-sarracenia-2.21.04~ubuntu20.10.1/sarra/__init__.py --- metpx-sarracenia-2.21.03~ubuntu20.10.1/sarra/__init__.py 2021-03-12 00:06:27.000000000 +0000 +++ metpx-sarracenia-2.21.04~ubuntu20.10.1/sarra/__init__.py 2021-04-17 08:25:05.000000000 +0000 @@ -25,4 +25,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -__version__ = "2.21.03" +__version__ = "2.21.04" diff -Nru metpx-sarracenia-2.21.03~ubuntu20.10.1/sarra/plugins/msg_pclean_f92.py metpx-sarracenia-2.21.04~ubuntu20.10.1/sarra/plugins/msg_pclean_f92.py --- metpx-sarracenia-2.21.03~ubuntu20.10.1/sarra/plugins/msg_pclean_f92.py 2021-03-12 00:06:28.000000000 +0000 +++ metpx-sarracenia-2.21.04~ubuntu20.10.1/sarra/plugins/msg_pclean_f92.py 2021-04-17 08:25:05.000000000 +0000 @@ -12,7 +12,7 @@ def on_message(self, parent): import os - parent.logger.info("msg_pclean_f92.py on_message") + parent.logger.info("msg_pclean_f92.py on_message %s" % parent.msg.relpath ) result = True msg_relpath = parent.msg.relpath @@ -24,6 +24,7 @@ f20_path = f20_path.replace(ext, '') try: os.unlink(f20_path) + parent.logger.info("unlinked 1 {}".format(f20_path)) except FileNotFoundError as err: parent.logger.error("could not unlink in {}: {}".format(f20_path, err)) parent.logger.debug("Exception details:", exc_info=True) @@ -33,8 +34,10 @@ for fxx_dir, path in path_dict.items(): try: os.unlink(path) + parent.logger.info("unlinked 2 {}".format(path)) if ext != '.moved': os.unlink(path.replace(ext, '')) + parent.logger.info("unlinked 3 {}".format(path.replace(ext,''))) except OSError as err: parent.logger.error("could not unlink in {}: {}".format(fxx_dir, err)) parent.logger.debug("Exception details:", exc_info=True) diff -Nru metpx-sarracenia-2.21.03~ubuntu20.10.1/sarra/sr_http.py metpx-sarracenia-2.21.04~ubuntu20.10.1/sarra/sr_http.py --- metpx-sarracenia-2.21.03~ubuntu20.10.1/sarra/sr_http.py 2021-03-12 00:06:28.000000000 +0000 +++ metpx-sarracenia-2.21.04~ubuntu20.10.1/sarra/sr_http.py 2021-04-17 08:25:05.000000000 +0000 @@ -106,7 +106,7 @@ if details : url = details.url self.user = url.username if url.username != '' else None - self.password = url.password if url.password == '' else None + self.password = url.password if url.password != '' else None self.bearer_token = details.bearer_token if hasattr(details, 'bearer_token' ) else None diff -Nru metpx-sarracenia-2.21.03~ubuntu20.10.1/sarra/sr.py metpx-sarracenia-2.21.04~ubuntu20.10.1/sarra/sr.py --- metpx-sarracenia-2.21.03~ubuntu20.10.1/sarra/sr.py 2021-03-12 00:06:28.000000000 +0000 +++ metpx-sarracenia-2.21.04~ubuntu20.10.1/sarra/sr.py 2021-04-17 08:25:05.000000000 +0000 @@ -128,6 +128,10 @@ f.write(pj +'\n') def _filter_sr_proc(self,p): + + if self.me != p['username'] : + return + # process name 'python3' is not helpful, so overwrite... if 'python' in p['name']: if len(p['cmdline']) < 2: @@ -135,7 +139,17 @@ n = os.path.basename(p['cmdline'][1]) p['name'] = n - if p['name'].startswith('sr_') and (self.me == p['username']): + if p['name'][0:2] != 'sr': + return + + if ( sys.platform == 'win32') and ( p['name'][-4:].lower() == '.exe' ): + # on windows, it seems to fork .exe and then there is a -script.py which is the right pid + # .e.g sr_subscribe.exe -> sr_subscribe-script.py ... If you kill the -script, the .exe goes away. + return + + #print( 'pname=%s, self.me=%s, pid=%s, cmdline=%s ' % \ + # ( p['name'], p['username'], p['pid'], p['cmdline'] ) ) + if p['name'].startswith('sr_'): self.procs[p['pid']] = p if p['name'][3:8] == 'audit': @@ -156,7 +170,7 @@ with open(File,'r') as f: self.me = f.readline().rstrip() for pj in f.readlines(): - p = json.loads(pj) + p = json.loads(pj) self._filter_sr_proc(p) pcount += 1 if pcount % 100 == 0 : print( '.', end='', flush=True ) @@ -167,7 +181,7 @@ self.procs = {} self.me = getpass.getuser() if sys.platform == 'win32': - self.me = os.environ['userdomain'] + '\\\\' + self.me + self.me = os.environ['userdomain'] + '\\' + self.me self.auditors = 0 for proc in psutil.process_iter( ): self._filter_sr_proc(proc.as_dict( ['pid','cmdline','name', 'username', 'create_time' ] )) diff -Nru metpx-sarracenia-2.21.03~ubuntu20.10.1/VERSION.txt metpx-sarracenia-2.21.04~ubuntu20.10.1/VERSION.txt --- metpx-sarracenia-2.21.03~ubuntu20.10.1/VERSION.txt 2021-03-12 00:06:27.000000000 +0000 +++ metpx-sarracenia-2.21.04~ubuntu20.10.1/VERSION.txt 2021-04-17 08:25:05.000000000 +0000 @@ -25,4 +25,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -__version__ = "2.21.03" +__version__ = "2.21.04"