diff -Nru bro-pkg-1.7.0/bropkg/__init__.py bro-pkg-1.7.1/bropkg/__init__.py --- bro-pkg-1.7.0/bropkg/__init__.py 2019-04-12 16:28:44.000000000 +0000 +++ bro-pkg-1.7.1/bropkg/__init__.py 2019-04-26 01:34:08.000000000 +0000 @@ -9,7 +9,7 @@ import logging -__version__ = "1.7.0" +__version__ = "1.7.1" __all__ = ['manager', 'package', 'source'] LOG = logging.getLogger(__name__) diff -Nru bro-pkg-1.7.0/bropkg/manager.py bro-pkg-1.7.1/bropkg/manager.py --- bro-pkg-1.7.0/bropkg/manager.py 2019-04-12 16:28:44.000000000 +0000 +++ bro-pkg-1.7.1/bropkg/manager.py 2019-04-26 01:34:08.000000000 +0000 @@ -1005,6 +1005,7 @@ along with the package info object retrieved by inspecting git repo contained in the bundle. """ + LOG.debug('getting bundle info for file "%s"', bundle_file) bundle_dir = os.path.join(self.scratch_dir, 'bundle') delete_path(bundle_dir) make_dir(bundle_dir) @@ -1033,6 +1034,7 @@ package = Package(git_url=git_url, name=git_url.split('/')[-1], canonical=True) pkg_path = os.path.join(bundle_dir, package.name) + LOG.debug('getting info for bundled package "%s"', package.name) pkg_info = self.info(pkg_path, version=version, prefer_installed=False) infos.append((git_url, version, pkg_info)) @@ -1680,6 +1682,7 @@ str: an empty string if the operation was successful, else an error message indicated what went wrong. """ + LOG.debug('unbundle "%s"', bundle_file) bundle_dir = os.path.join(self.scratch_dir, 'bundle') delete_path(bundle_dir) make_dir(bundle_dir) @@ -1709,6 +1712,7 @@ delete_path(clonepath) shutil.move(os.path.join(bundle_dir, package.name), clonepath) + LOG.debug('unbundle installing "%s"', package.name) error = self._install(package, version, use_existing_clone=True) if error: diff -Nru bro-pkg-1.7.0/bropkg/_util.py bro-pkg-1.7.1/bropkg/_util.py --- bro-pkg-1.7.0/bropkg/_util.py 2019-04-12 16:28:44.000000000 +0000 +++ bro-pkg-1.7.1/bropkg/_util.py 2019-04-26 01:34:08.000000000 +0000 @@ -103,7 +103,17 @@ git.Git().clone(git_url, dst_path, recursive=True) rval = git.Repo(dst_path) - rval.git.fetch(tags=True) + + # This setting of the "origin" remote will be a no-op in most cases, but + # for some reason, when cloning from a local directory, the clone may + # inherit the "origin" instead of using the local directory as its new + # "origin". This is bad in some cases since we do not want to try + # fetching from a remote location (e.g. when unbundling). This + # unintended inheritence of "origin" seems to only happen when cloning a + # local git repo that has submodules ? + rval.git.remote('set-url', 'origin', git_url) + + rval.git.fetch('--no-recurse-submodules', tags=True) return rval diff -Nru bro-pkg-1.7.0/CHANGES bro-pkg-1.7.1/CHANGES --- bro-pkg-1.7.0/CHANGES 2019-04-12 16:28:44.000000000 +0000 +++ bro-pkg-1.7.1/CHANGES 2019-04-26 01:34:08.000000000 +0000 @@ -1,4 +1,12 @@ +1.7.1 | 2019-04-25 18:32:13 -0700 + + * Release 1.7.1. + + * Fix unbundling packages that contain submodules (Jon Siwek, Corelight) + + * Add more logging to unbundle process (Jon Siwek, Corelight) + 1.7.0 | 2019-04-12 09:27:36 -0700 * Release 1.7.0. diff -Nru bro-pkg-1.7.0/debian/changelog bro-pkg-1.7.1/debian/changelog --- bro-pkg-1.7.0/debian/changelog 2019-04-22 12:46:01.000000000 +0000 +++ bro-pkg-1.7.1/debian/changelog 2019-05-02 09:10:05.000000000 +0000 @@ -1,3 +1,9 @@ +bro-pkg (1.7.1-1) unstable; urgency=medium + + * New upstream version 1.7.1 + + -- Robert Haist Thu, 02 May 2019 11:10:05 +0200 + bro-pkg (1.7.0-1) unstable; urgency=medium * [ebe98d3] New upstream version 1.7.0 diff -Nru bro-pkg-1.7.0/doc/man/bro-pkg.1 bro-pkg-1.7.1/doc/man/bro-pkg.1 --- bro-pkg-1.7.0/doc/man/bro-pkg.1 2019-04-12 16:28:44.000000000 +0000 +++ bro-pkg-1.7.1/doc/man/bro-pkg.1 2019-04-26 01:34:08.000000000 +0000 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "BRO-PKG" "1" "Apr 12, 2019" "1.7.0" "Zeek Package Manager" +.TH "BRO-PKG" "1" "Apr 25, 2019" "1.7.1" "Zeek Package Manager" .SH NAME bro-pkg \- Zeek Package Manager . diff -Nru bro-pkg-1.7.0/VERSION bro-pkg-1.7.1/VERSION --- bro-pkg-1.7.0/VERSION 2019-04-12 16:28:44.000000000 +0000 +++ bro-pkg-1.7.1/VERSION 2019-04-26 01:34:08.000000000 +0000 @@ -1 +1 @@ -1.7.0 +1.7.1