diff options
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | osc/conf.py | 13 | ||||
| -rw-r--r-- | osc/core.py | 2 | ||||
| -rw-r--r-- | osc/util/rpmquery.py | 2 | ||||
| -rw-r--r-- | packaging/osc.spec | 1 |
5 files changed, 4 insertions, 16 deletions
diff --git a/debian/control b/debian/control index 71823c2..9556ff9 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: http://en.opensuse.org/Build_Service/CLI Package: osc Section: devel Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-urlgrabber, python3-rpm, python3-keyring, python3-gobject, python3-m2crypto +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-urlgrabber, python3-rpm, python3-keyring, python3-m2crypto Suggests: build (> 2010.04.24) Description: openSUSE (buildsystem) commander Commandline client for the openSUSE Build Service, which allows to access diff --git a/osc/conf.py b/osc/conf.py index 3861f93..3a4c3d3 100644 --- a/osc/conf.py +++ b/osc/conf.py @@ -71,18 +71,7 @@ try: import keyring GENERIC_KEYRING = True except: - try: - import gobject - gobject.set_application_name('osc') - import gnomekeyring #pylint: disable=import-error - if os.environ['GNOME_DESKTOP_SESSION_ID']: - # otherwise gnome keyring bindings spit out errors, when you have - # it installed, but you are not under gnome - # (even though hundreds of gnome-keyring daemons got started in parallel) - # another option would be to support kwallet here - GNOME_KEYRING = gnomekeyring.is_available() - except: - pass + pass def _get_processors(): diff --git a/osc/core.py b/osc/core.py index f0d46ac..6708181 100644 --- a/osc/core.py +++ b/osc/core.py @@ -1355,7 +1355,7 @@ class Package: if not skip_local_service_run: r = self.run_source_services(mode="trylocal", verbose=verbose) - if r is not 0: + if r != 0: # FIXME: it is better to raise this in Serviceinfo.execute with more # information (like which service/command failed) raise oscerr.ServiceRuntimeError('A service failed with error: %d' % r) diff --git a/osc/util/rpmquery.py b/osc/util/rpmquery.py index 3543b6e..9989108 100644 --- a/osc/util/rpmquery.py +++ b/osc/util/rpmquery.py @@ -159,7 +159,7 @@ class RpmQuery(packagequery.PackageQuery, packagequery.PackageQueryResult): def __reqprov(self, tag, flags, version): pnames = self.header.gettag(tag) if not pnames: - return [] + return [] pnames = pnames.data pflags = self.header.gettag(flags).data pvers = self.header.gettag(version).data diff --git a/packaging/osc.spec b/packaging/osc.spec index 4039d0a..6c3330a 100644 --- a/packaging/osc.spec +++ b/packaging/osc.spec @@ -14,7 +14,6 @@ BuildRequires: python3-devel BuildRequires: python3-urlgrabber Requires: python3-urlgrabber Requires: python3-keyring -Requires: python3-gobject Requires: python3-rpm %if 0%{?suse_version} || "0%{?tizen_version}" != "0" |