Hello community,
here is the log from the commit of package osc for openSUSE:Factory checked in
at 2019-11-14 23:50:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/osc (Old)
and /work/SRC/openSUSE:Factory/.osc.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc"
Thu Nov 14 23:50:48 2019 rev:140 rq:748323 version:0.166.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/osc/osc.changes 2019-10-30 14:46:34.534102990
+0100
+++ /work/SRC/openSUSE:Factory/.osc.new.26869/osc.changes 2019-11-14
23:50:49.872574202 +0100
@@ -1,0 +2,16 @@
+Wed Nov 13 12:05:26 UTC 2019 - Marco Strigl <marco.str...@suse.com>
+
+- 0.166.2
+ * Don't enforce password reuse (boo#1156501)
+ * Config option check_for_requests_on_action is now
+ activated by default.
+ Use check_for_request_on_action = 0 in oscrc to
+ disable it
+ * osc vc --file=foo bar.changes now writes the content
+ from foo into bar.changes instead of creating a new file
+ (boo#1155953)
+ * fix output for missing pubkey when using http_debug=1 on
+ osc build
+ * fix crash of osc linkpac when there is already a _link
+
+-------------------------------------------------------------------
Old:
----
osc-0.166.1.tar.gz
New:
----
osc-0.166.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osc.spec ++++++
--- /var/tmp/diff_new_pack.Dw7Rc8/_old 2019-11-14 23:50:50.460573997 +0100
+++ /var/tmp/diff_new_pack.Dw7Rc8/_new 2019-11-14 23:50:50.460573997 +0100
@@ -27,12 +27,12 @@
%define use_python python
%endif
-%define version_unconverted 0.166.1
+%define version_unconverted 0.166.2
%define osc_plugin_dir %{_prefix}/lib/osc-plugins
%define macros_file macros.osc
Name: osc
-Version: 0.166.1
+Version: 0.166.2
Release: 0
Summary: Open Build Service Commander
License: GPL-2.0-or-later
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.Dw7Rc8/_old 2019-11-14 23:50:50.488573987 +0100
+++ /var/tmp/diff_new_pack.Dw7Rc8/_new 2019-11-14 23:50:50.492573986 +0100
@@ -1,5 +1,5 @@
pkgname=osc
-pkgver=0.166.1
+pkgver=0.166.2
pkgrel=0
pkgdesc="Open Build Service client"
arch=('i686' 'x86_64')
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Dw7Rc8/_old 2019-11-14 23:50:50.508573981 +0100
+++ /var/tmp/diff_new_pack.Dw7Rc8/_new 2019-11-14 23:50:50.508573981 +0100
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">0.166.1</param>
- <param name="revision">0.166.1</param>
+ <param name="version">0.166.2</param>
+ <param name="revision">0.166.2</param>
<param name="url">git://github.com/openSUSE/osc.git</param>
<param name="scm">git</param>
</service>
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.Dw7Rc8/_old 2019-11-14 23:50:50.540573970 +0100
+++ /var/tmp/diff_new_pack.Dw7Rc8/_new 2019-11-14 23:50:50.540573970 +0100
@@ -1,4 +1,4 @@
-osc (0.166.1) unstable; urgency=low
+osc (0.166.2) unstable; urgency=low
- Update to 0.161.1
-- Marco Strigl <marco.str...@suse.com> Thu, 26 Oct 2017 14:42:00 +0200
++++++ osc-0.166.1.tar.gz -> osc-0.166.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/NEWS new/osc-0.166.2/NEWS
--- old/osc-0.166.1/NEWS 2019-10-29 11:15:35.000000000 +0100
+++ new/osc-0.166.2/NEWS 2019-11-13 13:02:57.000000000 +0100
@@ -1,3 +1,16 @@
+0.166.2
+ - Don't enforce password reuse (boo#1156501)
+ - Config option check_for_requests_on_action is now
+ activated by default.
+ Use check_for_request_on_action = 0 in oscrc to
+ disable it
+ - osc vc --file=foo bar.changes now writes the content
+ from foo into bar.changes instead of creating a new file
+ (boo#1155953)
+ - fix output for missing pubkey when using http_debug=1 on
+ osc build
+ - fix crash of osc linkpac when there is already a _link
+
0.166.1
- emergency fix for credentials handling:
* in case of an old passx entry in oscrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/osc/commandline.py
new/osc-0.166.2/osc/commandline.py
--- old/osc-0.166.1/osc/commandline.py 2019-10-29 11:15:35.000000000 +0100
+++ new/osc-0.166.2/osc/commandline.py 2019-11-13 13:02:57.000000000 +0100
@@ -8980,8 +8980,8 @@
raise oscerr.WrongOptions('\'%s\': is no file' % opts.file)
args = list(args)
if not args:
- cmd_list.append('')
- cmd_list.append(opts.file)
+ args.append('')
+ args.append(opts.file)
if opts.just_edit:
cmd_list.append("-e")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/osc/conf.py new/osc-0.166.2/osc/conf.py
--- old/osc-0.166.1/osc/conf.py 2019-10-29 11:15:35.000000000 +0100
+++ new/osc-0.166.2/osc/conf.py 2019-11-13 13:02:57.000000000 +0100
@@ -158,7 +158,7 @@
# check for unversioned/removed files before commit
'check_filelist': '1',
# check for pending requests after executing an action (e.g.
checkout, update, commit)
- 'check_for_request_on_action': '0',
+ 'check_for_request_on_action': '1',
# what to do with the source package if the submitrequest has been
accepted
'submitrequest_on_accept_action': '',
'request_show_interactive': '0',
@@ -323,7 +323,7 @@
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/osc/core.py new/osc-0.166.2/osc/core.py
--- old/osc-0.166.1/osc/core.py 2019-10-29 11:15:35.000000000 +0100
+++ new/osc-0.166.2/osc/core.py 2019-11-13 13:02:57.000000000 +0100
@@ -5,7 +5,7 @@
from __future__ import print_function
-__version__ = '0.166.1'
+__version__ = '0.166.2'
# __store_version__ is to be incremented when the format of the working copy
# "store" changes in an incompatible way. Please add any needed migration
@@ -5142,7 +5142,7 @@
path_args=(quote_plus(dst_project),
quote_plus(dst_package)),
template_args=None,
create_new=False, apiurl=apiurl)
- root = ET.fromstring(''.join(dst_meta))
+ root = ET.fromstring(b''.join(dst_meta))
if root.get('project') != dst_project:
# The source comes from a different project via a project link, we
need to create this instance
meta_change = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/osc/credentials.py
new/osc-0.166.2/osc/credentials.py
--- old/osc-0.166.1/osc/credentials.py 2019-10-29 11:15:35.000000000 +0100
+++ new/osc-0.166.2/osc/credentials.py 2019-11-13 13:02:57.000000000 +0100
@@ -65,8 +65,6 @@
class PlaintextConfigFileCredentialsManager(AbstractCredentialsManager):
def get_password(self, url, user, defer=True):
- if self._cp.has_option(url, 'passx', proper=True):
- return self._cp.get(url, 'passx', raw=True)
return self._cp.get(url, 'pass', raw=True)
def set_password(self, url, user, password):
@@ -95,7 +93,10 @@
class ObfuscatedConfigFileCredentialsManager(
PlaintextConfigFileCredentialsManager):
def get_password(self, url, user, defer=True):
- passwd = super(self.__class__, self).get_password(url, user)
+ if self._cp.has_option(url, 'passx', proper=True):
+ passwd = self._cp.get(url, 'passx', raw=True)
+ else:
+ passwd = super(self.__class__, self).get_password(url, user)
return self.decode_password(passwd)
def set_password(self, url, user, password):
@@ -163,10 +164,6 @@
class KeyringCredentialsManager(AbstractCredentialsManager):
- def __init__(self, cp, options, appname='osc'):
- super(self.__class__, self).__init__(cp, options)
- self._appname = appname
-
def _process_options(self, options):
if options is None:
raise RuntimeError('options may not be None')
@@ -184,17 +181,17 @@
def get_password(self, url, user, defer=True):
self._load_backend()
- return keyring.get_password(self._appname, user)
+ return keyring.get_password(urlsplit(url)[1], user)
def set_password(self, url, user, password):
self._load_backend()
- keyring.set_password(self._appname, user, password)
+ keyring.set_password(urlsplit(url)[1], user, password)
config_value = self._qualified_name() + ':' + self._backend_cls_name
self._cp.set(url, self.config_entry, config_value)
def delete_password(self, url, user):
self._load_backend()
- keyring.delete_password(self._appname, user)
+ keyring.delete_password(urlsplit(url)[1], user)
class KeyringCredentialsDescriptor(AbstractCredentialsManagerDescriptor):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/osc/fetch.py new/osc-0.166.2/osc/fetch.py
--- old/osc-0.166.1/osc/fetch.py 2019-10-29 11:15:35.000000000 +0100
+++ new/osc-0.166.2/osc/fetch.py 2019-11-13 13:02:57.000000000 +0100
@@ -286,7 +286,7 @@
if try_parent:
if self.http_debug:
- print("can't fetch key for %s: %s" % (i, e.strerror),
file=sys.stderr)
+ print("can't fetch key for %s" % (i), file=sys.stderr)
print("url: %s" % url, file=sys.stderr)
if os.path.exists(dest):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/addfile_fixtures/oscrc
new/osc-0.166.2/tests/addfile_fixtures/oscrc
--- old/osc-0.166.1/tests/addfile_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/addfile_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/commit_fixtures/oscrc
new/osc-0.166.2/tests/commit_fixtures/oscrc
--- old/osc-0.166.1/tests/commit_fixtures/oscrc 2019-10-29 11:15:35.000000000
+0100
+++ new/osc-0.166.2/tests/commit_fixtures/oscrc 2019-11-13 13:02:57.000000000
+0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/commit_fixtures/testOpenRequests
new/osc-0.166.2/tests/commit_fixtures/testOpenRequests
--- old/osc-0.166.1/tests/commit_fixtures/testOpenRequests 1970-01-01
01:00:00.000000000 +0100
+++ new/osc-0.166.2/tests/commit_fixtures/testOpenRequests 2019-11-13
13:02:57.000000000 +0100
@@ -0,0 +1 @@
+<collection matches="0"></collection>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/conf_fixtures/oscrc
new/osc-0.166.2/tests/conf_fixtures/oscrc
--- old/osc-0.166.1/tests/conf_fixtures/oscrc 2019-10-29 11:15:35.000000000
+0100
+++ new/osc-0.166.2/tests/conf_fixtures/oscrc 2019-11-13 13:02:57.000000000
+0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/deletefile_fixtures/oscrc
new/osc-0.166.2/tests/deletefile_fixtures/oscrc
--- old/osc-0.166.1/tests/deletefile_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/deletefile_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/difffile_fixtures/oscrc
new/osc-0.166.2/tests/difffile_fixtures/oscrc
--- old/osc-0.166.1/tests/difffile_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/difffile_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/init_package_fixtures/oscrc
new/osc-0.166.2/tests/init_package_fixtures/oscrc
--- old/osc-0.166.1/tests/init_package_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/init_package_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/init_project_fixtures/oscrc
new/osc-0.166.2/tests/init_project_fixtures/oscrc
--- old/osc-0.166.1/tests/init_project_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/init_project_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/prdiff_fixtures/oscrc
new/osc-0.166.2/tests/prdiff_fixtures/oscrc
--- old/osc-0.166.1/tests/prdiff_fixtures/oscrc 2019-10-29 11:15:35.000000000
+0100
+++ new/osc-0.166.2/tests/prdiff_fixtures/oscrc 2019-11-13 13:02:57.000000000
+0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osc-0.166.1/tests/project_package_status_fixtures/oscrc
new/osc-0.166.2/tests/project_package_status_fixtures/oscrc
--- old/osc-0.166.1/tests/project_package_status_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/project_package_status_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/repairwc_fixtures/oscrc
new/osc-0.166.2/tests/repairwc_fixtures/oscrc
--- old/osc-0.166.1/tests/repairwc_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/repairwc_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/request_fixtures/oscrc
new/osc-0.166.2/tests/request_fixtures/oscrc
--- old/osc-0.166.1/tests/request_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/request_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/results_fixtures/oscrc
new/osc-0.166.2/tests/results_fixtures/oscrc
--- old/osc-0.166.1/tests/results_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/results_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/revertfile_fixtures/oscrc
new/osc-0.166.2/tests/revertfile_fixtures/oscrc
--- old/osc-0.166.1/tests/revertfile_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/revertfile_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/setlinkrev_fixtures/oscrc
new/osc-0.166.2/tests/setlinkrev_fixtures/oscrc
--- old/osc-0.166.1/tests/setlinkrev_fixtures/oscrc 2019-10-29
11:15:35.000000000 +0100
+++ new/osc-0.166.2/tests/setlinkrev_fixtures/oscrc 2019-11-13
13:02:57.000000000 +0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/test_commit.py
new/osc-0.166.2/tests/test_commit.py
--- old/osc-0.166.1/tests/test_commit.py 2019-10-29 11:15:35.000000000
+0100
+++ new/osc-0.166.2/tests/test_commit.py 2019-11-13 13:02:57.000000000
+0100
@@ -31,6 +31,7 @@
exp='This file didn\'t change but\nis modified.\n', text=rev_dummy)
@POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin',
file='testSimple_cfilesremote', expfile='testSimple_lfilelist')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27simple%27+or+action%2Fsource%2F%40package%3D%27simple%27%29',
file='testOpenRequests')
def test_simple(self):
"""a simple commit (only one modified file)"""
self._change_to_pkg('simple')
@@ -54,6 +55,7 @@
exp='added file\n', text=rev_dummy)
@POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin',
file='testAddfile_cfilesremote', expfile='testAddfile_lfilelist')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27add%27+or+action%2Fsource%2F%40package%3D%27add%27%29',
file='testOpenRequests')
def test_addfile(self):
"""commit a new file"""
self._change_to_pkg('add')
@@ -75,6 +77,7 @@
exp='', text='<services />')
@POST('http://localhost/source/osctest/delete?comment=&cmd=commitfilelist&user=Admin&withvalidate=1',
file='testDeletefile_cfilesremote',
expfile='testDeletefile_lfilelist')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27delete%27+or+action%2Fsource%2F%40package%3D%27delete%27%29',
file='testOpenRequests')
def test_deletefile(self):
"""delete a file"""
self._change_to_pkg('delete')
@@ -127,6 +130,7 @@
@PUT('http://localhost/source/osctest/multiple/add2?rev=repository',
exp='add2\n', text=rev_dummy)
@POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin',
file='testMultiple_cfilesremote', expfile='testMultiple_lfilelist')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27multiple%27+or+action%2Fsource%2F%40package%3D%27multiple%27%29',
file='testOpenRequests')
def test_multiple(self):
"""a simple commit (only one modified file)"""
self._change_to_pkg('multiple')
@@ -155,6 +159,7 @@
@PUT('http://localhost/source/osctest/multiple/nochange?rev=repository',
exp='This file did change.\n', text=rev_dummy)
@POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin',
file='testPartial_cfilesremote', expfile='testPartial_lfilelist')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27multiple%27+or+action%2Fsource%2F%40package%3D%27multiple%27%29',
file='testOpenRequests')
def test_partial(self):
"""commit only some files"""
self._change_to_pkg('multiple')
@@ -201,6 +206,7 @@
@PUT('http://localhost/source/osctest/allstates/nochange?rev=repository',
exp='This file did change.\n', text=rev_dummy)
@POST('http://localhost/source/osctest/allstates?comment=&cmd=commitfilelist&user=Admin',
file='testAllStates_cfilesremote', expfile='testAllStates_lfilelist')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27allstates%27+or+action%2Fsource%2F%40package%3D%27allstates%27%29',
file='testOpenRequests')
def test_allstates(self):
"""commit all files (all states are available except 'C')"""
self._change_to_pkg('allstates')
@@ -226,6 +232,7 @@
exp='', text='<services />')
@POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin&withvalidate=1',
file='testAddfile_cfilesremote', expfile='testAddfile_lfilelist')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27add%27+or+action%2Fsource%2F%40package%3D%27add%27%29',
file='testOpenRequests')
def test_remoteexists(self):
"""file 'add' should be committed but already exists on the server"""
self._change_to_pkg('add')
@@ -251,6 +258,7 @@
@POST('http://localhost/source/osctest/branch?comment=&cmd=commitfilelist&user=Admin&keeplink=1',
file='testExpand_cfilesremote', expfile='testExpand_lfilelist')
@GET('http://localhost/source/osctest/branch?rev=87ea02aede261b0267aabaa97c756e7a',
file='testExpand_expandedfilesremote')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27branch%27+or+action%2Fsource%2F%40package%3D%27branch%27%29',
file='testOpenRequests')
def test_expand(self):
"""commit an expanded package"""
self._change_to_pkg('branch')
@@ -282,6 +290,7 @@
@PUT('http://localhost/source/osctest/added_missing/bar?rev=repository',
exp='foobar\n', text=rev_dummy)
@POST('http://localhost/source/osctest/added_missing?comment=&cmd=commitfilelist&user=Admin',
file='testAddedMissing_cfilesremote',
expfile='testAddedMissing_lfilelist')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27added_missing%27+or+action%2Fsource%2F%40package%3D%27added_missing%27%29',
file='testOpenRequests')
def test_added_missing2(self):
"""commit an added file, another added file missing (but it's not part
of the commit)"""
self._change_to_pkg('added_missing')
@@ -323,6 +332,7 @@
exp='This file didn\'t change but\nis modified.\n', text=rev_dummy)
@POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin',
file='testSimple_cfilesremote',
expfile='testSimple_lfilelistwithSHA')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27simple%27+or+action%2Fsource%2F%40package%3D%27simple%27%29',
file='testOpenRequests')
def test_simple_sha256(self):
"""a simple commit (only one modified file)"""
self._change_to_pkg('simple')
@@ -347,6 +357,7 @@
@PUT('http://localhost/source/osctest/added_missing/bar?rev=repository',
exp='foobar\n', text=rev_dummy)
@POST('http://localhost/source/osctest/added_missing?comment=&cmd=commitfilelist&user=Admin',
file='testAddedMissing_cfilesremote',
expfile='testAddedMissing_lfilelistwithSHA')
+
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27added_missing%27+or+action%2Fsource%2F%40package%3D%27added_missing%27%29',
file='testOpenRequests')
def test_added_missing2_sha256(self):
"""commit an added file, another added file missing (but it's not part
of the commit)"""
self._change_to_pkg('added_missing')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.166.1/tests/update_fixtures/oscrc
new/osc-0.166.2/tests/update_fixtures/oscrc
--- old/osc-0.166.1/tests/update_fixtures/oscrc 2019-10-29 11:15:35.000000000
+0100
+++ new/osc-0.166.2/tests/update_fixtures/oscrc 2019-11-13 13:02:57.000000000
+0100
@@ -80,7 +80,7 @@
# check for unversioned/removed files before commit
#check_filelist = 1
# check for pending requests after executing an action (e.g. checkout, update,
commit)
-#check_for_request_on_action = 0
+#check_for_request_on_action = 1
# what to do with the source package if the submitrequest has been accepted. If
# nothing is specified the API default is used
#submitrequest_on_accept_action = cleanup|update|noupdate
++++++ osc.dsc ++++++
--- /var/tmp/diff_new_pack.Dw7Rc8/_old 2019-11-14 23:50:50.796573880 +0100
+++ /var/tmp/diff_new_pack.Dw7Rc8/_new 2019-11-14 23:50:50.796573880 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: osc
-Version: 0.166.1
+Version: 0.166.2
Binary: osc
Maintainer: Adrian Schroeter <adr...@suse.de>
Architecture: any
