Hello community,
here is the log from the commit of package osc for openSUSE:Factory
checked in at Fri Mar 5 16:04:36 CET 2010.
--------
--- osc/osc.changes 2010-01-27 13:19:37.000000000 +0100
+++ /mounts/work_src_done/STABLE/osc/osc.changes 2010-02-08 11:53:19.000000000 +0100
@@ -0,0 +1,8 @@
+Mon Feb 1 09:16:17 UTC 2010 - adrian@suse.de
+
+- update to version 0.125.5
+ - rdiff happens against baserev now
+ - fixed "osc build --local-package
+ - detect a kiwi file on build
+ - improved _service file handling
+
calling whatdependson for head-i586
Old:
----
osc-0.125.4.tar.gz
New:
----
osc-0.125.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osc.spec ++++++
--- /var/tmp/diff_new_pack.C0FMU6/_old 2010-03-05 16:04:14.000000000 +0100
+++ /var/tmp/diff_new_pack.C0FMU6/_new 2010-03-05 16:04:14.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package osc (Version 0.125.4)
+# spec file for package osc (Version 0.125.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,7 +26,7 @@
BuildRequires: m2crypto
Requires: m2crypto > 0.19
%endif
-Version: 0.125.4
+Version: 0.125.5
Release: 1
Group: Development/Tools/Other
License: GPLv2+
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.C0FMU6/_old 2010-03-05 16:04:14.000000000 +0100
+++ /var/tmp/diff_new_pack.C0FMU6/_new 2010-03-05 16:04:14.000000000 +0100
@@ -1,12 +1,17 @@
+osc (0.125.4-2) unstable; urgency=low
+ - Fix build and install
+
+ -- Lubos Lunak Thu, 28 Jan 2010 16:39:57 +0100
+
osc (0.125.4-1) unstable; urgency=high
-- Updated to 0.125.4
+ - Updated to 0.125.4
--- Adrian Schroeter Wed, 27 Jan 2010 10:00:00 +0200
+ -- Adrian Schroeter Wed, 27 Jan 2010 10:00:00 +0200
osc (0.125.1-1) unstable; urgency=high
-- Updated to 0.125.1
+ - Updated to 0.125.1
--- Adrian Schroeter Fr, 15 Jan 2010 10:00:00 +0200
+ -- Adrian Schroeter Fr, 15 Jan 2010 10:00:00 +0200
osc (0.123-1) unstable; urgency=high
- Updated to 0.123
++++++ debian.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/control new/debian/control
--- old/debian/control 2009-06-04 16:15:55.000000000 +0200
+++ new/debian/control 2010-01-28 16:35:13.000000000 +0100
@@ -8,7 +8,7 @@
Package: osc
Section: devel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-celementtree, python-urlgrabber
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-celementtree, python-urlgrabber, python-m2crypto
Description: openSUSE (buildsystem) commander
svn-like cmdline tool (and python library) to maintain source files in the
opensuse buildservice
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/rules new/debian/rules
--- old/debian/rules 2009-10-19 19:42:48.000000000 +0200
+++ new/debian/rules 2010-01-28 17:02:02.000000000 +0100
@@ -68,7 +68,9 @@
#$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
#python setup.py install --install-layout=deb
# --prefix=$(CURDIR)/debian/tmp/usr
- python setup.py install --root=debian/tmp --no-compile;
+ # try also without --install-layout=deb for older distros
+ python setup.py install --root=debian/tmp --no-compile --install-layout=deb || \
+ python setup.py install --root=debian/tmp --no-compile
# Build architecture-independent files here.
++++++ osc-0.125.4.tar.gz -> osc-0.125.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.125.4/NEWS new/osc-0.125.5/NEWS
--- old/osc-0.125.4/NEWS 2010-01-27 13:17:44.000000000 +0100
+++ new/osc-0.125.5/NEWS 2010-02-08 11:51:03.000000000 +0100
@@ -1,4 +1,10 @@
+0.125.5
+ - use the baserev on links by default for diffing
+ - fixed "osc build --local-package
+ - detect a kiwi file on build
+ - improved _service file handling
+
0.125.4
- fix "osc patchinfo" command (crashed before)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.125.4/README new/osc-0.125.5/README
--- old/osc-0.125.4/README 2009-12-09 07:55:18.000000000 +0100
+++ new/osc-0.125.5/README 2010-02-08 11:43:03.000000000 +0100
@@ -4,8 +4,8 @@
Patches can be submitted via
* mail to opensuse-buildservice@opensuse.org
* Bugzilla: https://bugzilla.novell.com/enter_bug.cgi?product=openSUSE.org&component=BuildService
- * or work directly on svn, if you got write acces
- https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/p...
+ * or the official Git repository on Gitorious:
+ http://gitorious.org/opensuse/osc
INSTALLATION:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.125.4/osc/commandline.py new/osc-0.125.5/osc/commandline.py
--- old/osc-0.125.4/osc/commandline.py 2010-01-27 13:17:44.000000000 +0100
+++ new/osc-0.125.5/osc/commandline.py 2010-02-08 11:49:06.000000000 +0100
@@ -651,8 +651,6 @@
help='never touch source package on accept (will break source links)')
@cmdln.option('-d', '--diff', action='store_true',
help='show diff only instead of creating the actual request')
- @cmdln.option('-l', '--list', action='store_true',
- help='show submitrequests. Same as \'osc req list -M -a -t submit -D 0\'')
@cmdln.option('--yes', action='store_true',
help='proceed without asking.')
@cmdln.alias("sr")
@@ -673,17 +671,6 @@
${cmd_option_list}
"""
- if opts.list:
- opts.state = ""
- opts.user = ""
- opts.all = True
- opts.brief = False
- opts.unified = False
- opts.type = "submit"
- opts.mine = True
- opts.days = conf.config['request_list_days']
- return self.do_request('list', opts, *args)
-
src_update = conf.config['submitrequest_on_accept_action'] or None
# we should check here for home:<id>:branch and default to update, but that would require OBS 1.7 server
if opts.cleanup:
@@ -700,10 +687,9 @@
if args and args[0] in oldcmds:
print "************************************************************************"
print "* WARNING: It looks that you are using this command with a *"
- print "* deprecated syntax (maybe) ! *"
- print "* Please run \"osc sr --help\" and \"osc req --help\" *"
+ print "* deprecated syntax. *"
+ print "* Please run \"osc sr --help\" and \"osc rq --help\" *"
print "* to see the new syntax. *"
- print "* E.g. \"osc sr -l\" is shortcut for \"osc req list -M -a -t submit -D 0\" *"
print "************************************************************************"
if args[0] == 'create':
args.pop(0)
@@ -2379,7 +2365,7 @@
# (a) update all packages
args += prj.pacs_have
# (b) fetch new packages
- prj.checkout_missing_pacs(expand_link = not opts.unexpand_link)
+ prj.checkout_missing_pacs(opts.expand_link)
args.remove(arg)
print_request_list(prj.apiurl, prj.name)
@@ -2398,34 +2384,27 @@
if len(pacs) > 1:
print 'Updating %s' % p.name
- # FIXME: ugly workaround for #399247
- if opts.expand_link or opts.unexpand_link:
- if [ i for i in p.filenamelist+p.filenamelist_unvers if p.status(i) != ' ' and p.status(i) != '?']:
- print >>sys.stderr, 'osc: cannot expand/unexpand because your working ' \
- 'copy has local modifications.\nPlease revert/commit them ' \
- 'and try again.'
- sys.exit(1)
+ if opts.expand_link and p.haslinkerror() and not p.islinkrepair():
+ raise oscerr.LinkExpandError(p.prjname, p.name, p.linkerror())
if not rev:
if opts.expand_link and p.islink() and not p.isexpanded():
- if p.haslinkerror():
- try:
- rev = show_upstream_xsrcmd5(p.apiurl, p.prjname, p.name, revision=p.rev)
- except:
- rev = show_upstream_xsrcmd5(p.apiurl, p.prjname, p.name, revision=p.rev, linkrev="base")
- p.mark_frozen()
- else:
- rev = p.linkinfo.xsrcmd5
- print 'Expanding to rev', rev
+ print 'Expanding to rev', p.linkinfo.xsrcmd5
+ rev = p.linkinfo.xsrcmd5
elif opts.unexpand_link and p.islink() and p.isexpanded():
print 'Unexpanding to rev', p.linkinfo.lsrcmd5
rev = p.linkinfo.lsrcmd5
elif p.islink() and p.isexpanded():
rev = p.latest_rev()
+ # FIXME: ugly workaround for #399247
+ if opts.expand_link or opts.unexpand_link:
+ if [ i for i in p.filenamelist+p.filenamelist_unvers if p.status(i) != ' ' and p.status(i) != '?']:
+ print >>sys.stderr, 'osc: cannot expand/unexpand because your working ' \
+ 'copy has local modifications. Please remove them ' \
+ 'and try again'
+ sys.exit(1)
p.update(rev, service_files)
- if opts.unexpand_link:
- p.unmark_frozen()
rev = None
print_request_list(p.apiurl, p.prjname, p.name)
@@ -3082,6 +3061,8 @@
help='Do not run post build checks on the resulting packages.')
@cmdln.option('--no-verify', action='store_true',
help='Skip signature verification of packages used for build.')
+ @cmdln.option('--noservice', '--no-service', action='store_true',
+ help='Skip run of local source services as specified in _service file.')
@cmdln.option('-p', '--prefer-pkgs', metavar='DIR', action='append',
help='Prefer packages from this directory when installing the build-root')
@cmdln.option('-k', '--keep-pkgs', metavar='DIR',
@@ -3179,7 +3160,7 @@
arg_arch = arg_repository = arg_descr = None
if len(args) < 3:
for arg in args:
- if arg.endswith('.spec') or arg.endswith('.dsc'):
+ if arg.endswith('.spec') or arg.endswith('.dsc') or arg.endswith('.kiwi'):
arg_descr = arg
else:
if arg in osc.build.can_also_build.get(osc.build.hostarch, []) or \
@@ -3195,33 +3176,25 @@
arg_arch = arg_arch or osc.build.hostarch
if not opts.noinit:
- repositories = get_repositories_of_project( \
- store_read_apiurl('.'), \
- opts.alternative_project or store_read_project('.'))
+ project = opts.alternative_project or store_read_project('.')
+ repositories = get_repositories_of_project(store_read_apiurl('.'), project)
+ if not len(repositories):
+ raise oscerr.WrongArgs('no repositories defined for project \'%s\'' % project)
if not arg_repository:
-
- if len(repositories) == 0:
- arg_repository = conf.config['build_repository']
-
- else:
-
- # Use a default value from config, but just even if it's available
- # unless try standard, or openSUSE_Factory
- for repository in (conf.config['build_repository'], 'standard', 'openSUSE_Factory'):
- if repository in repositories:
- arg_repository = repository
- break
-
- arg_repository = arg_repository or repositories[len(repositories)-1]
-
+ # Use a default value from config, but just even if it's available
+ # unless try standard, or openSUSE_Factory
+ arg_repository = repositories[-1]
+ for repository in (conf.config['build_repository'], 'standard', 'openSUSE_Factory'):
+ if repository in repositories:
+ arg_repository = repository
+ break
if not arg_repository in repositories:
- raise oscerr.WrongArgs('%s is not a valid repository, use one of: %s' % (arg_repository, ", ".join(repositories)))
-
- if not arg_repository:
- raise oscerr.WrongArgs('please specify a repository')
+ raise oscerr.WrongArgs('%s is not a valid repository, use one of: %s' % (arg_repository, ', '.join(repositories)))
+ elif not arg_repository:
+ raise oscerr.WrongArgs('please specify a repository')
# check for source services
- if os.listdir('.').count("_service"):
+ if not opts.noservice and not opts.noinit and os.listdir('.').count("_service"):
p = Package('.')
p.run_source_services()
@@ -4603,7 +4576,8 @@
raise oscerr.APIError('link target is broken')
if linkinfo_new.get('srcmd5') == baserev:
print "Already up-to-date."
- p.unmark_frozen()
+ if os.path.exists(os.path.join(p.storedir, '_frozenlink')):
+ os.unlink(os.path.join(p.storedir, '_frozenlink'))
return
dir_new = { 'apiurl': p.apiurl, 'project': p.prjname, 'package': p.name }
dir_new['srcmd5'] = root_new.get('srcmd5')
@@ -4675,7 +4649,8 @@
p.write_conflictlist()
# store new linkrev
store_write_string(p.absdir, '_pulled', linkinfo_new.get('srcmd5'))
- p.unmark_frozen()
+ if os.path.exists(os.path.join(p.storedir, '_frozenlink')):
+ os.unlink(os.path.join(p.storedir, '_frozenlink'))
print
if len(p.in_conflict):
print 'Please fix the conflicts (files marked with \'C\' above),'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.125.4/osc/core.py new/osc-0.125.5/osc/core.py
--- old/osc-0.125.4/osc/core.py 2010-01-22 09:21:46.000000000 +0100
+++ new/osc-0.125.5/osc/core.py 2010-02-08 11:51:12.000000000 +0100
@@ -5,7 +5,7 @@
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or version 3 (at your option).
-__version__ = '0.125.3'
+__version__ = '0.125.5'
# __store_version__ is to be incremented when the format of the working copy
# "store" changes in an incompatible way. Please add any needed migration
@@ -507,20 +507,13 @@
if pac in self.pacs_broken:
if self.get_state(pac) != 'A':
checkout_package(self.apiurl, self.name, pac,
- pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir, expand_link=not unexpand_link)
+ pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir, expand_link=expand_link)
elif state == ' ':
# do a simple update
p = Package(os.path.join(self.dir, pac))
rev = None
if expand_link and p.islink() and not p.isexpanded():
- if p.haslinkerror():
- try:
- rev = show_upstream_xsrcmd5(p.apiurl, p.prjname, p.name, revision=p.rev)
- except:
- rev = show_upstream_xsrcmd5(p.apiurl, p.prjname, p.name, revision=p.rev, linkrev="base")
- p.mark_frozen()
- else:
- rev = p.linkinfo.xsrcmd5
+ rev = p.linkinfo.xsrcmd5
print 'Expanding to rev', rev
elif unexpand_link and p.islink() and p.isexpanded():
rev = p.linkinfo.lsrcmd5
@@ -529,8 +522,6 @@
rev = p.latest_rev()
print 'Updating %s' % p.name
p.update(rev, service_files)
- if unexpand_link:
- p.unmark_frozen()
elif state == 'D':
# TODO: Package::update has to fixed to behave like svn does
if pac in self.pacs_broken:
@@ -548,7 +539,7 @@
else:
print 'unexpected state.. package \'%s\'' % pac
- self.checkout_missing_pacs(expand_link=not unexpand_link)
+ self.checkout_missing_pacs()
finally:
self.write_packages()
@@ -1269,18 +1260,6 @@
mf.discard()
- def mark_frozen(self):
- store_write_string(self.absdir, '_frozenlink', '')
- print
- print "The link in this package is currently broken. I have checked"
- print "out the last working version instead, please use 'osc pull'"
- print "to repair the link."
- print
-
- def unmark_frozen(self):
- if os.path.exists(os.path.join(self.storedir, '_frozenlink')):
- os.unlink(os.path.join(self.storedir, '_frozenlink'))
-
def latest_rev(self):
if self.islinkrepair():
upstream_rev = show_upstream_xsrcmd5(self.apiurl, self.prjname, self.name, linkrepair=1)
@@ -1291,11 +1270,13 @@
try:
upstream_rev = show_upstream_xsrcmd5(self.apiurl, self.prjname, self.name)
except:
- try:
- upstream_rev = show_upstream_xsrcmd5(self.apiurl, self.prjname, self.name, linkrev=self.linkinfo.srcmd5)
- except:
- upstream_rev = show_upstream_xsrcmd5(self.apiurl, self.prjname, self.name, linkrev="base")
- self.mark_frozen()
+ upstream_rev = show_upstream_xsrcmd5(self.apiurl, self.prjname, self.name, linkrev=self.linkinfo.srcmd5)
+ store_write_string(self.absdir, '_frozenlink', '')
+ print
+ print "The link in this package is currently broken. I have checked"
+ print "out the last working version instead, please use 'osc pull'"
+ print "to repair the link."
+ print
else:
upstream_rev = show_upstream_rev(self.apiurl, self.prjname, self.name)
return upstream_rev
@@ -3051,7 +3032,12 @@
os.chdir(os.pardir)
p = Package(package)
if isfrozen:
- p.mark_frozen()
+ store_write_string(p.absdir, '_frozenlink', '')
+ print
+ print "The link in this package is currently broken. I have checked"
+ print "out the last working version instead, please use 'osc pull'"
+ print "to repair the link."
+ print
for filename in p.filenamelist:
if service_files or not filename.startswith('_service:'):
p.updatefile(filename, revision)
@@ -4493,7 +4479,7 @@
p.todo = p.filenamelist + p.filenamelist_unvers
p.todo.sort()
for f in (f for f in p.todo if not os.path.isdir(f)):
- if p.status(f) in ('?', '!'):
+ if not f.startswith('_service:') and not f.startswith('_service_') and p.status(f) in ('?', '!'):
resp = raw_input("File `%s' is not in package meta. Would you like skip/remove/edit file lists/commit/abort? (s/r/e/c/A) "% (f, ))
if resp in ('s', 'S'):
continue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.125.4/setup.py new/osc-0.125.5/setup.py
--- old/osc-0.125.4/setup.py 2009-12-09 07:55:18.000000000 +0100
+++ new/osc-0.125.5/setup.py 2010-02-08 11:43:03.000000000 +0100
@@ -59,7 +59,7 @@
platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME'],
keywords = ['openSUSE', 'SUSE', 'RPM', 'build', 'buildservice'],
url = 'http://en.opensuse.org/Build_Service/CLI',
- download_url = 'https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/p...',
+ download_url = 'http://gitorious.org/opensuse/osc',
packages = ['osc', 'osc.util'],
scripts = ['osc_hotshot.py', 'osc-wrapper.py'],
++++++ osc.dsc ++++++
--- /var/tmp/diff_new_pack.C0FMU6/_old 2010-03-05 16:04:15.000000000 +0100
+++ /var/tmp/diff_new_pack.C0FMU6/_new 2010-03-05 16:04:15.000000000 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: osc
-Version: 0.125.4-1
+Version: 0.125.5-1
Binary: osc
Maintainer: Adrian Schroeter
Architecture: any
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org