Skip to contentSkip to conversation

opkg-utils fix for python-2.6 and fix for missing getopts

PATCH Applied Martin Jansa 2 participants 6 messages May 29, 2012 – Jun 19, 2012

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

cover opkg-utils fix for python-2.6 and fix for missing getopts

The following changes since commit 44df9dd3dc411ca1255cb4b23bde7eb71aed4778:

opkg-make-index: disable filelist by default (2012-04-26 11:39:42 +0100)

are available in the git repository at:
git://github.com/shr-project/opkg-utils jansa/pull
https://github.com/shr-project/opkg-utils/tree/jansa/pull

Chris Diamand (1):
Changed call to subprocess.check_output which isn't compatible with

    Python 2.6

Ondics Githubler (1):
Option "C" ist shown in usage() and implemented, but was missing in
getopts. Added "C".

 opkg-build      |    2 +-
 opkg-make-index |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.8.6
author
#1 lore raw

PATCH 1/2 Option "C" ist shown in usage() and implemented, but was missing in getopts. Added "C".

From: Ondics Githubler <[email protected]>

Signed-off-by Martin Jansa <[email protected]>
---
 opkg-build |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
opkg-build +1 -1
index 012afd3..485897a 100755
@@ -160,7 +160,7 @@ outer=ar
 noclean=0
 opkext=0
 usage="Usage: $0 [-c] [-C] [-O] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
-while getopts "cg:ho:vO" opt; do
+while getopts "cCg:ho:vO" opt; do
     case $opt in
 	o ) owner=$OPTARG
 	    ogargs="--owner=$owner"
Signature · 1 line
1.7.8.6
author
#2 lore raw

PATCH 2/2 Changed call to subprocess.check_output which isn't compatible with Python 2.6

In reply to Martin Jansa

From: Chris Diamand <[email protected]>

subprocess.check_output is not present in Python 2.6. Since the return value is not being used anyway, replace it with subprocess.call(), which is.

Signed-off-by Chris Diamand <[email protected]>
---
 opkg-make-index |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
opkg-make-index +1 -1
index 22393e8..1c3a8e1 100755
@@ -186,7 +186,7 @@ if packages_filename:
      gzip_filename = ("%s.gz" % packages_filename)
      tmp_gzip_filename = ("%s.%d" % (gzip_filename, os.getpid()))
      gzip_cmd = "gzip -9c < %s > %s" % (tmp_packages_filename, tmp_gzip_filename)
-     rc = subprocess.check_output(gzip_cmd, shell=True)
+     subprocess.call(gzip_cmd, shell=True)
      os.rename(tmp_packages_filename, packages_filename)
      os.rename(tmp_gzip_filename, gzip_filename)
Signature · 1 line
1.7.8.6
author
#3 lore raw
In reply to Martin Jansa
Quoted 3 lines · Martin Jansa

The following changes since commit 44df9dd3dc411ca1255cb4b23bde7eb71aed4778:

opkg-make-index: disable filelist by default (2012-04-26 11:39:42 +0100)

ping?

Quoted 20 lines

are available in the git repository at:
git://github.com/shr-project/opkg-utils jansa/pull
https://github.com/shr-project/opkg-utils/tree/jansa/pull

Chris Diamand (1):
Changed call to subprocess.check_output which isn't compatible with

    Python 2.6

Ondics Githubler (1):
Option "C" ist shown in usage() and implemented, but was missing in
getopts. Added "C".

 opkg-build      |    2 +-
 opkg-make-index |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.8.6
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#4 lore raw
Quoted 6 lines · Martin Jansa
Quoted 3 lines · Martin Jansa

The following changes since commit 44df9dd3dc411ca1255cb4b23bde7eb71aed4778:

opkg-make-index: disable filelist by default (2012-04-26 11:39:42 +0100)

ping?

Can I get push access to this repo, I know you're all busy but waiting 20+ days for small fixes to get applied is not very efficient. Another guy on #oe asked today why package-index is always failing in oe-classic..

Cheers,

Quoted 22 lines
Quoted 19 lines

are available in the git repository at:
git://github.com/shr-project/opkg-utils jansa/pull
https://github.com/shr-project/opkg-utils/tree/jansa/pull

Chris Diamand (1):
Changed call to subprocess.check_output which isn't compatible with

    Python 2.6

Ondics Githubler (1):
Option "C" ist shown in usage() and implemented, but was missing in
getopts. Added "C".

 opkg-build      |    2 +-
 opkg-make-index |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.8.6
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Applied
#5 lore raw
In reply to Martin Jansa
Quoted 8 lines · Martin Jansa

The following changes since commit 44df9dd3dc411ca1255cb4b23bde7eb71aed4778:

opkg-make-index: disable filelist by default (2012-04-26 11:39:42 +0100)

are available in the git repository at:
git://github.com/shr-project/opkg-utils jansa/pull
https://github.com/shr-project/opkg-utils/tree/jansa/pull

Quoted 7 lines

Chris Diamand (1):
Changed call to subprocess.check_output which isn't compatible with

    Python 2.6

Ondics Githubler (1):
Option "C" ist shown in usage() and implemented, but was missing in
getopts. Added "C".

Merged to master. Sorry about the delay, I'd missed the original patches. I'd meant to sort this after I saw the reminder yesterday but didn't get to it until today.

Cheers,

Richard