summarylogtreecommitdiffstats
path: root/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
diff options
context:
space:
mode:
authorBjörn Bidar2022-05-15 12:28:42 +0300
committerBjörn Bidar2022-05-15 12:28:42 +0300
commitd1d9256f88479c0e3458908bd69c4df5a68c0d6a (patch)
tree843d62c0dd85424ce3815e53947c9b9e0b7ac43a /0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
parente5f15edab3c87b91f4397dc367dc442ae5df800d (diff)
downloadaur-d1d9256f88479c0e3458908bd69c4df5a68c0d6a.tar.gz
Update 0.177.0
- New upstream release - Rebase patches
Diffstat (limited to '0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch')
-rw-r--r--0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch19
1 files changed, 8 insertions, 11 deletions
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 3b3d9bc8c3bc..547acc6da228 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
@@ -1,7 +1,7 @@
-From d4ce37e73270c857df5e6d19177660ce6eead73e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Marko Lemmetty <marko.lemmetty@jollamobile.com>
Date: Fri, 15 May 2020 14:47:19 +0300
-Subject: [PATCH 4/7] Add -p to copyprj to enable copying of prjconf
+Subject: [PATCH] Add -p to copyprj to enable copying of prjconf
---
osc/commandline.py | 4 +++-
@@ -9,10 +9,10 @@ Subject: [PATCH 4/7] 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 a395ee19..e8166115 100644
+index 2063bfe5..bde97403 100644
--- a/osc/commandline.py
+++ b/osc/commandline.py
-@@ -3160,6 +3160,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
+@@ -3178,6 +3178,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 a395ee19..e8166115 100644
@cmdln.option('-r', '--re-sign', action='store_true',
help='re-sign the binaries')
@cmdln.option('-m', '--message', metavar='TEXT',
-@@ -3205,7 +3207,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
+@@ -3223,7 +3225,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 a395ee19..e8166115 100644
print("done cp")
print(r)
diff --git a/osc/core.py b/osc/core.py
-index de116a70..8036b616 100644
+index 42923737..84ef3b79 100644
--- a/osc/core.py
+++ b/osc/core.py
-@@ -5556,6 +5556,8 @@ def copy_prj(src_apiurl, src_project, dst_project,
+@@ -5565,6 +5565,8 @@ def copy_prj(src_apiurl, src_project, dst_project,
withhistory = False,
makeolder = False,
resign = False,
@@ -43,7 +43,7 @@ index de116a70..8036b616 100644
comment = None):
"""
Create a copy of a project.
-@@ -5577,6 +5579,9 @@ def copy_prj(src_apiurl, src_project, dst_project,
+@@ -5586,6 +5588,9 @@ def copy_prj(src_apiurl, src_project, dst_project,
query['comment'] = comment
if now:
query['nodelay'] = '1'
@@ -53,6 +53,3 @@ index de116a70..8036b616 100644
u = makeurl(src_apiurl, ['source', dst_project], query=query)
print >>sys.stderr, "copyprj ", u
f = http_POST(u)
---
-2.34.1
-