Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2017-12-07 13:53:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc" Thu Dec 7 13:53:57 2017 rev:125 rq:553430 version:0.162.1 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2017-11-29 10:54:42.508191000 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2017-12-07 13:54:32.219760789 +0100 @@ -1,0 +2,6 @@ +Tue Dec 5 13:41:04 UTC 2017 - [email protected] + +- 0.162.1 + - Send sha256 hashes for tracked files if the wc is pulled/linkrepair + +------------------------------------------------------------------- Old: ---- osc-0.162.0.tar.gz New: ---- osc-0.162.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.MuYmLf/_old 2017-12-07 13:54:36.291613129 +0100 +++ /var/tmp/diff_new_pack.MuYmLf/_new 2017-12-07 13:54:36.291613129 +0100 @@ -16,12 +16,12 @@ # -%define version_unconverted 0.162.0 +%define version_unconverted 0.162.1 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.162.0 +Version: 0.162.1 Release: 0 Summary: Open Build Service Commander License: GPL-2.0+ ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.MuYmLf/_old 2017-12-07 13:54:36.319612113 +0100 +++ /var/tmp/diff_new_pack.MuYmLf/_new 2017-12-07 13:54:36.323611968 +0100 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.162.0 +pkgver=0.162.1 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.MuYmLf/_old 2017-12-07 13:54:36.339611388 +0100 +++ /var/tmp/diff_new_pack.MuYmLf/_new 2017-12-07 13:54:36.343611243 +0100 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.162.0</param> - <param name="revision">0.162.0</param> + <param name="version">0.162.1</param> + <param name="revision">0.162.1</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.MuYmLf/_old 2017-12-07 13:54:36.379609938 +0100 +++ /var/tmp/diff_new_pack.MuYmLf/_new 2017-12-07 13:54:36.379609938 +0100 @@ -1,4 +1,4 @@ -osc (0.162.0) unstable; urgency=low +osc (0.162.1) unstable; urgency=low - Update to 0.161.1 -- Marco Strigl <[email protected]> Thu, 26 Oct 2017 14:42:00 +0200 ++++++ osc-0.162.0.tar.gz -> osc-0.162.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.162.0/NEWS new/osc-0.162.1/NEWS --- old/osc-0.162.0/NEWS 2017-11-28 15:00:03.000000000 +0100 +++ new/osc-0.162.1/NEWS 2017-12-05 14:29:03.000000000 +0100 @@ -1,3 +1,6 @@ +0.162.1 + - Send sha256 hashes for tracked files if the wc is pulled/linkrepair + 0.162 - Additional file content check with SHA256 when using OBS 2.9 - support deb format with control.tar.xz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.162.0/osc/commandline.py new/osc-0.162.1/osc/commandline.py --- old/osc-0.162.0/osc/commandline.py 2017-11-28 15:00:03.000000000 +0100 +++ new/osc-0.162.1/osc/commandline.py 2017-12-05 14:29:03.000000000 +0100 @@ -4737,6 +4737,8 @@ help='update to specified revision (this option will be ignored ' 'if you are going to update the complete project or more than ' 'one package)') + @cmdln.option('', '--linkrev', metavar='REV', + help='revision of the link target that is used during link expansion') @cmdln.option('-u', '--unexpand-link', action='store_true', help='if a package is an expanded link, update to the raw _link file') @cmdln.option('-e', '--expand-link', action='store_true', @@ -4774,11 +4776,10 @@ ${cmd_option_list} """ - if (opts.expand_link and opts.unexpand_link) \ - or (opts.expand_link and opts.revision) \ - or (opts.unexpand_link and opts.revision): - raise oscerr.WrongOptions('Sorry, the options --expand-link, --unexpand-link and ' - '--revision are mutually exclusive.') + if opts.expand_link and opts.unexpand_link: + raise oscerr.WrongOptions('Sorry, the options --expand-link and ' + '--unexpand-link and are mutually ' + 'exclusive.') args = parseargs(args) arg_list = args[:] @@ -4809,6 +4810,28 @@ if not checkRevision(pacs[0].prjname, pacs[0].name, rev, pacs[0].apiurl): print('Revision \'%s\' does not exist' % rev, file=sys.stderr) sys.exit(1) + if opts.expand_link or opts.unexpand_link: + meta = show_files_meta(pacs[0].apiurl, pacs[0].prjname, + pacs[0].name, revision=rev, + linkrev=opts.linkrev, + expand=opts.server_side_source_service_files) + directory = ET.fromstring(meta) + li_node = directory.find('linkinfo') + if li_node is None: + print('Revision \'%s\' is no link' % rev, file=sys.stderr) + sys.exit(1) + li = Linkinfo() + li.read(li_node) + if li.haserror() and opts.expand_link: + raise oscerr.LinkExpandError(pacs[0].prjname, pacs[0].name, + li.error) + rev = li.lsrcmd5 + if opts.expand_link: + rev = li.xsrcmd5 + if rev is None: + # 2 cases: a) unexpand and passed rev has linkerror + # b) expand and passed rev is already expanded + rev = directory.get('srcmd5') else: rev = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.162.0/osc/core.py new/osc-0.162.1/osc/core.py --- old/osc-0.162.0/osc/core.py 2017-11-28 15:00:03.000000000 +0100 +++ new/osc-0.162.1/osc/core.py 2017-12-05 14:29:03.000000000 +0100 @@ -5,7 +5,7 @@ from __future__ import print_function -__version__ = '0.161.1git' +__version__ = '0.162.1' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration @@ -1484,6 +1484,15 @@ 'error: file \'%s\' with state \'%s\' is not known by meta' \ % (filename, st)) todo_send[filename] = f.md5 + if ((self.ispulled() or self.islinkrepair()) and st != 'A' + and filename not in sha256sums): + # Ignore files with state 'A': if we should consider it, + # it would have been in pac.todo, which implies that it is + # in sha256sums. + # The storefile is guaranteed to exist (since we have a + # pulled/linkrepair wc, the file cannot have state 'S') + storefile = os.path.join(self.storedir, filename) + sha256sums[filename] = sha256_dgst(storefile) if not force and not real_send and not todo_delete and not self.islinkrepair() and not self.ispulled(): print('nothing to do for package %s' % self.name) ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.MuYmLf/_old 2017-12-07 13:54:36.707598043 +0100 +++ /var/tmp/diff_new_pack.MuYmLf/_new 2017-12-07 13:54:36.711597898 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.162.0 +Version: 0.162.1 Binary: osc Maintainer: Adrian Schroeter <[email protected]> Architecture: any
