Hello community,
here is the log from the commit of package osc for openSUSE:Factory checked in
at 2012-10-07 19:53:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/osc (Old)
and /work/SRC/openSUSE:Factory/.osc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc", Maintainer is "adr...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/osc/osc.changes 2012-09-20 16:00:21.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2012-10-07
19:54:05.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Sep 27 19:52:24 UTC 2012 - suse-...@gmx.de
+
+- update to 0.136.0:
+ * prefer TLS v1.1 or v1.2 if available
+ * declined is considered to be an open state (that is "osc rq list" also
+ shows declined requests)
+ * added support to move files across packages via "osc mv" (fixes issue #10)
+ * various bugfixes
+
+-------------------------------------------------------------------
Old:
----
osc-0.135.1.tar.gz
New:
----
osc-0.136.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osc.spec ++++++
--- /var/tmp/diff_new_pack.LAzlVQ/_old 2012-10-07 19:54:07.000000000 +0200
+++ /var/tmp/diff_new_pack.LAzlVQ/_new 2012-10-07 19:54:07.000000000 +0200
@@ -17,7 +17,7 @@
Name: osc
-Version: 0.135.1
+Version: 0.136.0
Release: 0
Summary: openSUSE Build Service Commander
License: GPL-2.0+
++++++ _service ++++++
--- /var/tmp/diff_new_pack.LAzlVQ/_old 2012-10-07 19:54:07.000000000 +0200
+++ /var/tmp/diff_new_pack.LAzlVQ/_new 2012-10-07 19:54:07.000000000 +0200
@@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">0.135.1</param>
+ <param name="version">0.136.0</param>
<param name="url">git://github.com/openSUSE/osc.git</param>
<param name="scm">git</param>
</service>
++++++ osc-0.135.1.tar.gz -> osc-0.136.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.135.1/NEWS new/osc-0.136.0/NEWS
--- old/osc-0.135.1/NEWS 2012-06-30 11:24:14.000000000 +0200
+++ new/osc-0.136.0/NEWS 2012-09-27 21:46:58.000000000 +0200
@@ -1,3 +1,13 @@
+0.136
+ - prefer TLS v1.1 or v1.2 if available
+ - declined is considered to be an open state (that is "osc rq list" also
shows declined requests)
+ - added support to move files across packages via "osc mv" (fixes issue #10)
+ - various bugfixes:
+ * show source package name when running "osc se --binary ..."
+ * fixed encoding detection
+ * fixed build result listing for arch packages (affects "osc build")
+ * "osc ci --noservice" works also for "external"/flat packages
+
0.135.1
- do not forward requests to packages which do link anyway to original
request target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.135.1/osc/build.py new/osc-0.136.0/osc/build.py
--- old/osc-0.135.1/osc/build.py 2012-06-30 11:24:14.000000000 +0200
+++ new/osc-0.136.0/osc/build.py 2012-09-27 21:46:58.000000000 +0200
@@ -257,13 +257,22 @@
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'KIWI'),
'-type', 'f'],
stdout=subprocess.PIPE).stdout.read().strip()
- else:
+ elif pactype == 'deb':
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'DEBS'),
'-name', '*.deb'],
stdout=subprocess.PIPE).stdout.read().strip()
s_built = subprocess.Popen(['find', os.path.join(pacdir,
'SOURCES.DEB'),
'-type', 'f'],
stdout=subprocess.PIPE).stdout.read().strip()
+ elif pactype == 'arch':
+ b_built = subprocess.Popen(['find', os.path.join(pacdir, 'ARCHPKGS'),
+ '-name', '*.pkg.tar*'],
+
stdout=subprocess.PIPE).stdout.read().strip()
+ s_built = []
+ else:
+ print >>sys.stderr, 'WARNING: Unknown package type \'%s\'.' % pactype
+ b_built = []
+ s_built = []
return s_built, b_built
def get_repo(path):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.135.1/osc/commandline.py
new/osc-0.136.0/osc/commandline.py
--- old/osc-0.135.1/osc/commandline.py 2012-06-30 11:24:14.000000000 +0200
+++ new/osc-0.136.0/osc/commandline.py 2012-09-27 21:46:58.000000000 +0200
@@ -1747,8 +1747,8 @@
help='all states. Same as\'-s all\'')
@cmdln.option('-f', '--force', action='store_true',
help='enforce state change, can be used to ignore open
reviews')
- @cmdln.option('-s', '--state', default='', # default is 'all' if no args
given, 'new,review' otherwise
- help='only list requests in one of the comma separated
given states (new/review/accepted/revoked/declined) or "all"
[default="new,review", or "all", if no args given]')
+ @cmdln.option('-s', '--state', default='', # default is 'all' if no args
given, 'declined,new,review' otherwise
+ help='only list requests in one of the comma separated
given states (new/review/accepted/revoked/declined) or "all"
[default="declined,new,review", or "all", if no args given]')
@cmdln.option('-D', '--days', metavar='DAYS',
help='only list requests in state "new" or changed in
the last DAYS. [default=%(request_list_days)s]')
@cmdln.option('-U', '--user', metavar='USER',
@@ -1871,7 +1871,7 @@
opts.state = 'all'
if opts.state == '':
- opts.state = 'new,review'
+ opts.state = 'declined,new,review'
if args[0] == 'help':
return self.do_help(['help', 'request'])
@@ -6159,7 +6159,11 @@
if project is None:
project = node.get('name')
else:
- package = node.get('name')
+ if kind == 'published/binary/id':
+ package = node.get('package')
+ else:
+ package = node.get('name')
+
result.append(project)
if not package is None:
result.append(package)
@@ -7174,13 +7178,20 @@
raise oscerr.WrongArgs("Source file ``%s'' does not exists" %
source)
if not opts.force and os.path.isfile(dest):
raise oscerr.WrongArgs("Dest file ``%s'' already exists" % dest)
- if not is_package_dir('.'):
- raise oscerr.NoWorkingCopy("Error: \"%s\" is not an osc working
copy." % os.path.abspath(dir))
+ src_pkg = findpacs([source])
+ tgt_pkg = findpacs([dest])
+ if not src_pkg:
+ raise oscerr.NoWorkingCopy("Error: \"%s\" is not located in an osc
working copy." % os.path.abspath(source))
+ if not tgt_pkg:
+ raise oscerr.NoWorkingCopy("Error: \"%s\" does not point to an osc
working copy." % os.path.abspath(dest))
- p = findpacs('.')[0]
os.rename(source, dest)
- self.do_add(subcmd, opts, dest)
- self.do_delete(subcmd, opts, source)
+ try:
+ tgt_pkg[0].addfile(os.path.basename(dest))
+ except oscerr.PackageFileConflict:
+ # file is already tracked
+ pass
+ src_pkg[0].delete_file(os.path.basename(source), force=opts.force)
@cmdln.option('-d', '--delete', action='store_true',
help='delete option from config or reset option to the
default)')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.135.1/osc/core.py new/osc-0.136.0/osc/core.py
--- old/osc-0.135.1/osc/core.py 2012-06-30 11:24:14.000000000 +0200
+++ new/osc-0.136.0/osc/core.py 2012-09-27 21:46:58.000000000 +0200
@@ -3,7 +3,7 @@
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or version 3 (at your option).
-__version__ = '0.135'
+__version__ = '0.136'
# __store_version__ is to be incremented when the format of the working copy
# "store" changes in an incompatible way. Please add any needed migration
@@ -787,7 +787,7 @@
elif pac in self.pacs_broken:
print 'osc: \'%s\' package not found' % pac
elif state == None:
- self.commitExtPackage(pac, msg, todo, verbose=verbose)
+ self.commitExtPackage(pac, msg, todo, verbose=verbose,
skip_local_service_run=skip_local_service_run)
finally:
self.write_packages()
else:
@@ -856,7 +856,7 @@
delete_package(self.apiurl, self.name, pac)
self.del_package_node(pac)
- def commitExtPackage(self, pac, msg, files = [], verbose=False):
+ def commitExtPackage(self, pac, msg, files = [], verbose=False,
skip_local_service_run=False):
"""commits a package from an external project"""
if os_path_samefile(os.path.join(self.dir, pac), os.getcwd()):
pac_path = '.'
@@ -875,7 +875,7 @@
template_args=({'name': pac, 'user': user}),
apiurl=apiurl)
p = Package(pac_path)
p.todo = files
- p.commit(msg=msg, verbose=verbose)
+ p.commit(msg=msg, verbose=verbose,
skip_local_service_run=skip_local_service_run)
def __str__(self):
r = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.135.1/osc/oscssl.py
new/osc-0.136.0/osc/oscssl.py
--- old/osc-0.135.1/osc/oscssl.py 2012-06-30 11:24:14.000000000 +0200
+++ new/osc-0.136.0/osc/oscssl.py 2012-09-27 21:46:58.000000000 +0200
@@ -155,7 +155,7 @@
def __init__(self):
SSL.Context.__init__(self, 'sslv23')
self.set_options(m2.SSL_OP_NO_SSLv2 | m2.SSL_OP_NO_SSLv3)
-
self.set_cipher_list("ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!MD5:@STRENGTH")
+
self.set_cipher_list("ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH")
self.set_session_cache_mode(m2.SSL_SESS_CACHE_CLIENT)
self.verrs = None
#self.set_info_callback() # debug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.135.1/osc-wrapper.py
new/osc-0.136.0/osc-wrapper.py
--- old/osc-0.135.1/osc-wrapper.py 2012-06-30 11:24:14.000000000 +0200
+++ new/osc-0.136.0/osc-wrapper.py 2012-09-27 21:46:58.000000000 +0200
@@ -11,9 +11,9 @@
# this is a hack to make osc work as expected with utf-8 characters,
# no matter how site.py is set...
reload(sys)
-loc = locale.getdefaultlocale()[1]
+loc = locale.getpreferredencoding()
if not loc:
- loc = sys.getdefaultencoding()
+ loc = sys.getpreferredencoding()
sys.setdefaultencoding(loc)
del sys.setdefaultencoding
++++++ osc.dsc ++++++
--- /var/tmp/diff_new_pack.LAzlVQ/_old 2012-10-07 19:54:07.000000000 +0200
+++ /var/tmp/diff_new_pack.LAzlVQ/_new 2012-10-07 19:54:07.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: osc
-Version: 0.135.1
+Version: 0.136.0
Binary: osc
Maintainer: Adrian Schroeter <adr...@suse.de>
Architecture: any
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
