diff options
5 files changed, 22 insertions, 22 deletions
diff --git a/0001-Add-sb2install-support-to-osc.patch b/0001-Add-sb2install-support-to-osc.patch index 20037110634a..2e44fb3b816e 100644 --- a/0001-Add-sb2install-support-to-osc.patch +++ b/0001-Add-sb2install-support-to-osc.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Add sb2install support to osc 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/osc/build.py b/osc/build.py -index e2a5f423ad1059758d1816f4525c99bdf1eca98f..544f159456f1697319f3db4ddb69db294bbd988a 100644 +index 556bfddeccc34f3cbc776e6f24fbad00e43b28cb..b783b9c6d7e594f99abeb8e8b0308db82f1f0e18 100644 --- a/osc/build.py +++ b/osc/build.py @@ -190,12 +190,13 @@ class Buildinfo: @@ -36,7 +36,7 @@ index e2a5f423ad1059758d1816f4525c99bdf1eca98f..544f159456f1697319f3db4ddb69db29 self.mp[i] = node.get(i) self.mp['buildarch'] = buildarch -@@ -1401,6 +1403,7 @@ def main(apiurl, opts, argv): +@@ -1395,6 +1397,7 @@ def main(apiurl, opts, argv): rpmlist.append('preinstall: ' + ' '.join(bi.preinstall_list) + '\n') rpmlist.append('vminstall: ' + ' '.join(bi.vminstall_list) + '\n') diff --git a/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch b/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch index 88640534e85c..79c7cce025c5 100644 --- a/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch +++ b/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch @@ -13,10 +13,10 @@ Subject: [PATCH] Support 'osc copyprj' in api by Islam Amer usage: osc copyprj 2 files changed, 80 insertions(+) diff --git a/osc/commandline.py b/osc/commandline.py -index f0c2b367dcc303b8a7f9727d99a0625166e6d764..55a52d949bf20639a7632ace574c6fd77c97adb4 100644 +index 522c26eadd0ffab5b7858f2dd9fe211b7d1de9b1..d7a6cc5d776b739a68f4c62fb15604795afba7f4 100644 --- a/osc/commandline.py +++ b/osc/commandline.py -@@ -3908,6 +3908,58 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3898,6 +3898,58 @@ Please submit there instead, or use --nodevelproject to force direct submission. delayed=not opts.no_delay, print_to="stdout", ) @@ -76,10 +76,10 @@ index f0c2b367dcc303b8a7f9727d99a0625166e6d764..55a52d949bf20639a7632ace574c6fd7 @cmdln.option('-m', '--message', metavar='TEXT', help='specify message TEXT') diff --git a/osc/core.py b/osc/core.py -index aa7b36412107eaf716a65846ead0512f25cb9072..5b5f5c10c47d9bf56a290076bc752ff2bb1aea91 100644 +index 78cdb66d20d3b1bbfc3c4b2527465c2920dcf279..1eb1262150c0bb1e37814148eeae2436aa7e2484 100644 --- a/osc/core.py +++ b/osc/core.py -@@ -6152,6 +6152,34 @@ def copy_pac( +@@ -6179,6 +6179,34 @@ def copy_pac( raise oscerr.APIError('failed to copy: %s' % ', '.join(todo)) return 'Done.' diff --git a/0003-Support-synchronous-copyproj.patch b/0003-Support-synchronous-copyproj.patch index 246400e6f9bc..4c142b83f59d 100644 --- a/0003-Support-synchronous-copyproj.patch +++ b/0003-Support-synchronous-copyproj.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Support synchronous copyproj 2 files changed, 7 insertions(+) diff --git a/osc/commandline.py b/osc/commandline.py -index 55a52d949bf20639a7632ace574c6fd77c97adb4..f7a7512f5a6967980a2433e5c8e95136a97d8257 100644 +index d7a6cc5d776b739a68f4c62fb15604795afba7f4..b43852914273326748a772b48402480952e28eab 100644 --- a/osc/commandline.py +++ b/osc/commandline.py -@@ -3910,6 +3910,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3900,6 +3900,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. ) @cmdln.option('-b', '--with-binaries', action='store_true', help='copy the built binaries over to avoid a rebuild') @@ -21,7 +21,7 @@ index 55a52d949bf20639a7632ace574c6fd77c97adb4..f7a7512f5a6967980a2433e5c8e95136 @cmdln.option('-x', '--with-history', action='store_true', help='replicate the history of each package.') @cmdln.option('-o', '--make-older', action='store_true', -@@ -3927,6 +3929,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3917,6 +3919,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. The user must be able to create DESTPRJ @@ -30,7 +30,7 @@ index 55a52d949bf20639a7632ace574c6fd77c97adb4..f7a7512f5a6967980a2433e5c8e95136 usage: osc copyprj SOURCEPRJ DESTPRJ ${cmd_option_list} -@@ -3956,6 +3960,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3946,6 +3950,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. withhistory = opts.with_history, makeolder = opts.make_older, resign = opts.re_sign, @@ -39,10 +39,10 @@ index 55a52d949bf20639a7632ace574c6fd77c97adb4..f7a7512f5a6967980a2433e5c8e95136 print("done cp") print(r) diff --git a/osc/core.py b/osc/core.py -index 5b5f5c10c47d9bf56a290076bc752ff2bb1aea91..45a6236d93078ff1e1779d8984c7c01a9385048a 100644 +index 1eb1262150c0bb1e37814148eeae2436aa7e2484..72ffb62b06670c2f27cd87f80f783c47e993537e 100644 --- a/osc/core.py +++ b/osc/core.py -@@ -6176,6 +6176,8 @@ def copy_prj(src_apiurl, src_project, dst_project, +@@ -6203,6 +6203,8 @@ def copy_prj(src_apiurl, src_project, dst_project, query['resign'] = '1' if comment: query['comment'] = comment diff --git a/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch b/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch index 691e483bde7d..b6f38f9c0cca 100644 --- a/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch +++ b/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Add -p to copyprj to enable copying of prjconf 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/osc/commandline.py b/osc/commandline.py -index f7a7512f5a6967980a2433e5c8e95136a97d8257..3eb0887dab6331f32fd3ed32462685fc94477aca 100644 +index b43852914273326748a772b48402480952e28eab..81ca666b6a59fb69a872ecf5c00eabd6d545fd79 100644 --- a/osc/commandline.py +++ b/osc/commandline.py -@@ -3916,6 +3916,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3906,6 +3906,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. help='replicate the history of each package.') @cmdln.option('-o', '--make-older', action='store_true', help='No idea') @@ -21,7 +21,7 @@ index f7a7512f5a6967980a2433e5c8e95136a97d8257..3eb0887dab6331f32fd3ed32462685fc @cmdln.option('-r', '--re-sign', action='store_true', help='re-sign the binaries') @cmdln.option('-m', '--message', metavar='TEXT', -@@ -3960,7 +3962,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3950,7 +3952,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. withhistory = opts.with_history, makeolder = opts.make_older, resign = opts.re_sign, @@ -31,10 +31,10 @@ index f7a7512f5a6967980a2433e5c8e95136a97d8257..3eb0887dab6331f32fd3ed32462685fc print("done cp") print(r) diff --git a/osc/core.py b/osc/core.py -index 45a6236d93078ff1e1779d8984c7c01a9385048a..3ce4b2257fa959d0067d950ddc5c88ddafa80eac 100644 +index 72ffb62b06670c2f27cd87f80f783c47e993537e..52a59a51bd35625d4d64ab8581d41448c8604273 100644 --- a/osc/core.py +++ b/osc/core.py -@@ -6157,6 +6157,8 @@ def copy_prj(src_apiurl, src_project, dst_project, +@@ -6184,6 +6184,8 @@ def copy_prj(src_apiurl, src_project, dst_project, withhistory = False, makeolder = False, resign = False, @@ -43,7 +43,7 @@ index 45a6236d93078ff1e1779d8984c7c01a9385048a..3ce4b2257fa959d0067d950ddc5c88dd comment = None): """ Create a copy of a project. -@@ -6178,6 +6180,9 @@ def copy_prj(src_apiurl, src_project, dst_project, +@@ -6205,6 +6207,9 @@ def copy_prj(src_apiurl, src_project, dst_project, query['comment'] = comment if now: query['nodelay'] = '1' diff --git a/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch b/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch index ee0966072b54..972417de7ba4 100644 --- a/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch +++ b/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch @@ -14,10 +14,10 @@ Subject: [PATCH] Add support for --rebuild and --chroot-only in build. 2 files changed, 10 insertions(+) diff --git a/osc/build.py b/osc/build.py -index 544f159456f1697319f3db4ddb69db294bbd988a..70f53cb0043b8a8b3d0cbc8a8e5e7cbae4635be4 100644 +index b783b9c6d7e594f99abeb8e8b0308db82f1f0e18..6218d3f01d89ad54a0267433b59996b9ddd8ff92 100644 --- a/osc/build.py +++ b/osc/build.py -@@ -696,6 +696,12 @@ def main(apiurl, opts, argv): +@@ -687,6 +687,12 @@ def main(apiurl, opts, argv): buildargs.append('--norootforbuild') if opts.clean: buildargs.append('--clean') @@ -31,10 +31,10 @@ index 544f159456f1697319f3db4ddb69db294bbd988a..70f53cb0043b8a8b3d0cbc8a8e5e7cba buildargs.append('--no-checks') if not opts.no_changelog: diff --git a/osc/commandline.py b/osc/commandline.py -index 3eb0887dab6331f32fd3ed32462685fc94477aca..c0e85a62405836a4725bffb8888df3bf7b1e2068 100644 +index 81ca666b6a59fb69a872ecf5c00eabd6d545fd79..ad8d0aaf1656f98883651e1341e7f3c2a6073ace 100644 --- a/osc/commandline.py +++ b/osc/commandline.py -@@ -7039,6 +7039,10 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -7034,6 +7034,10 @@ Please submit there instead, or use --nodevelproject to force direct submission. help='Copy overlay filesystem to buildroot after installing all RPMs .') @cmdln.option('--noinit', '--no-init', action='store_true', help='Skip initialization of build root and start with build immediately.') |