Bug#777665: Simple fix attached

2015-02-12 Thread Joe Healy
Tags: + patch

I've attached a patch for a direct fix.

I'm delaying applying it for 24-48 hours until I hear from upstream if
salt-common should require python-msgpack or not.

A fair bit of the code implies python-msgpack should not be needed for
local (ie salt-call) use.

Joe
diff --git a/debian/control b/debian/control
index 256af75..100f03e 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Depends: ${python:Depends},
  python-jinja2,
  python-apt,
  python-yaml,
+ python-msgpack,
  python-pkg-resources
 Recommends: lsb-release,
 python-mako


Bug#770174: [Pkg-salt-team] Bug#770174: salt-common: service module doesn't work for init scripts

2014-11-24 Thread Joe Healy
Thanks Julien,

I'll apply this fix and upload tonight. I'll also look at the other fixes
made upstream on the 2014.1 branch.

Joe

On Wed, Nov 19, 2014 at 10:43 PM, Julien Cristau 
wrote:

> Package: salt-common
> Version: 2014.1.13+ds-1
> Severity: grave
> Tags: patch upstream fixed-upstream
> Justification: renders package unusable
>
> Hi,
>
> when booting with systemd, the service module is provided by
> salt/modules/systemd.py, which only considers native systemd units in
> its get_all function, not services provided by init scripts.  This
> breaks the service state.
>
> The fix is in upstream commits
> 90bece1faa1862465e97f7caf262c65cd84583ff and
> 968b26f45351d790a9fa2afd9bbd6c5bb31f13d5, so basically:
>
> diff --git a/salt/modules/systemd.py b/salt/modules/systemd.py
> --- a/salt/modules/systemd.py
> +++ b/salt/modules/systemd.py
> @@ -72,6 +74,28 @@ def _systemctl_cmd(action, name):
>  return 'systemctl {0} {1}'.format(action, _canonical_unit_name(name))
>
>
> +def _get_all_units():
> +'''
> +Get all units and their state. Units ending in .service
> +are normalized so that they can be referenced without a type suffix.
> +'''
> +rexp = re.compile(r'(?m)^(?P.+)\.(?P' +
> +  '|'.join(VALID_UNIT_TYPES) +
> +  r')\s+loaded\s+(?P[^\s]+)')
> +
> +out = __salt__['cmd.run_stdout'](
> +'systemctl --all --full --no-legend --no-pager list-units | col
> -b'
> +)
> +
> +ret = {}
> +for match in rexp.finditer(out):
> +name = match.group('name')
> +if match.group('type') != 'service':
> +name += '.' + match.group('type')
> +ret[name] = match.group('active')
> +return ret
> +
> +
>  def _get_all_unit_files():
>  '''
>  Get all unit files and their state. Unit files ending in .service
> @@ -173,7 +197,7 @@ def get_all():
>
>  salt '*' service.get_all
>  '''
> -return sorted(_get_all_unit_files().keys())
> +return sorted(set(_get_all_units().keys() +
> _get_all_unit_files().keys()))
>
>
>  def available(name):
>
>
> There are a few other fixes in that file that might be worth
> considering, but at least the above is I think necessary for salt to
> be in decent shape for jessie.
>
> Cheers,
> Julien
> --
> Julien Cristau  
> Logilab http://www.logilab.fr/
> Informatique scientifique & gestion de connaissances
>
> ___
> pkg-salt-team mailing list
> pkg-salt-t...@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-salt-team
>


Bug#741522: [Pkg-salt-team] Bug#741522: python-libcloud in sid

2014-06-17 Thread Joe Healy
Yes, It can, I'll close it off.


Thanks,


Joe
On Jun 17, 2014 8:06 PM, "Marcin Kulisz"  wrote:

> Looks like in jessie and sid we already have python-libcloud_0.14.1-1, so
> this
> issue should go.
> --
>
> |_|0|_|  |
> |_|_|0| "Heghlu'Meh QaQ jajVam"  |
> |0|0|0|  kuLa -  |
>
> gpg --keyserver pgp.mit.edu --recv-keys 0x58C338B3
> 3DF1 A4DF C732 4688 38BC F121 6869 30DD  58C3 38B3
>
> ___
> pkg-salt-team mailing list
> pkg-salt-t...@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-salt-team
>


Bug#748092: [Pkg-salt-team] Bug#748092: salt-ssh: Missing dependency to python-zmq

2014-05-14 Thread Joe Healy
Upstream have made a fix, so I'll do a new release to fix this shortly.

https://github.com/saltstack/salt/commit/de4d823b9afdbd1f96735a796a3ecee295b3dcda


Bug#748092: [Pkg-salt-team] Bug#748092: salt-ssh: Missing dependency to python-zmq

2014-05-14 Thread Joe Healy
Thanks for the report.

https://github.com/saltstack/salt/issues/12766

I've submitted this bug upstream and will follow to see when it is resolved.

In the mean time, I'll have a quick look to see if i can patch the issue,
otherwise I'll look at depending on python-zmq.

Thanks,

Joe


Bug#741522: salt-cloud: requires newer version of python-libcloud

2014-03-13 Thread Joe Healy
Package: salt-cloud
Version: 2014.1.0+ds-1
Severity: grave
Justification: renders package unusable


   * What led up to the situation?

Running salt-cloud gives the following exception:

# salt-cloud
Traceback (most recent call last):
  File "/usr/bin/salt-cloud", line 10, in 
salt_cloud()
  File "/usr/lib/pymodules/python2.7/salt/scripts.py", line 121, in salt_cloud
cloud.run()
  File "/usr/lib/pymodules/python2.7/salt/cloud/cli.py", line 50, in run
libcloud_version()
  File "/usr/lib/pymodules/python2.7/salt/cloud/libcloudfuncs.py", line 94, in
libcloud_version
'libcloud 0.13.2. Please upgrade.'.format(libcloud.__version__)
ImportError: Your version of libcloud is 0.5.0. salt-cloud requires >= libcloud
0.13.2. Please upgrade.


this should not have occurred. The package for python-libcloud needs to be
updated and a versioned dependency added.



-- System Information:
Debian Release: 7.2
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_AU.utf8, LC_CTYPE=en_AU.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#736783: [Pkg-salt-team] Bug#736783: [src:salt] Sourceless file

2014-01-27 Thread Joe Healy
I'll add the override - that is trivial.

With the modernizr*.min.js file, the source is in
modernizr.custom.20463.js.
I'll get upstream to rename it for future releases and do a ds release in
the mean time.

Thanks,

Joe


On Mon, Jan 27, 2014 at 8:04 AM, bastien ROUCARIES <
roucaries.bast...@gmail.com> wrote:

> Package: src:salt
> Version: 0.17.4-2
> Severity: serious
> User: debian...@lists.debian.org
> Usertags: source-contains-prebuilt-javascript-object
> X-Debbugs-CC: ftpmas...@debian.org
>
> salt 0.17.4-2 (source)
> I could not find the source of:
>
> doc/_themes/saltstack/static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
> Please add an override for:
>   doc/_themes/saltstack/static/js/vendor/bootstrap.min.js
>
>
>
>
> Bastien
>
> ___
> pkg-salt-team mailing list
> pkg-salt-t...@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-salt-team
>


Bug#725999: [Pkg-salt-team] Bug#725999: salt: fails to ship source and incomplete debian/copyright

2013-10-21 Thread Joe Healy
On Mon, Oct 21, 2013 at 06:01:58AM -0400, Luke Faraone wrote:
> Yes. If you don't want to modify the upstream tarball this is then the
> recommended approach.

Thanks Luke, it turns out I need to modify the upstream tarball as
there are non DFSG files (fonts) in there.

So I'll remove these files and patch to use the versions packaged by
debian.

Thanks,

Joe


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#726480: upstream appear to have a patch

2013-10-16 Thread Joe Healy
https://github.com/saltstack/salt/pull/7356/files


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#725999: [Pkg-salt-team] Bug#725999: salt: fails to ship source and incomplete debian/copyright

2013-10-10 Thread Joe Healy
Thanks for picking these up and apologies for letting them through.

On Thu, Oct 10, 2013 at 08:05:18PM -0400, Luke Faraone wrote:
> 
> Please document
> ../doc/_themes/saltstack/static/css/bootstrap-responsive.css in
> debian/copyright.

Will do.

> 
> Please also recreate the minified versions during your package build,
> don't just accept the ones generated by upstream.

Will do.

> 
> You do not ship the source for
> ../doc/_themes/saltstack/static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
> at all, which is patently unacceptable.

Agreed. Is it acceptable to add the source in via a quilt patch then
build the minified version? or is there a better approach?

> 
> This package embeds jQuery, which is suboptimal as jQuery is packaged in
> Debian. Regardless, it must be mentioned in debian/copyright.
> 

My understanding is that there are two approaches I could use here. I
could rebuild the upstream .tar.gz without jQuery (and the others) or
I could depend on the debian jQuery and patch the documentation to use
the debian jQuery.

If I do the second, we would still ship a (unused) version of jQuery
in the orig.tar.gz, however, it would not be present in the .deb. As
such, it should still be mentioned in the debian/copyright. Is this
correct?

I'm not thrilled by either option (upstream not including it/them
would be best), but am leaning towards not modifying the orig.tar.gz
as at this stage, I believe the contentious files are all (able to be)
DFSG compliant.

Thanks for your assistance.

Joe


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org