[copr] master: tito releasers upadted to include new repos @copr/copr (target: @copr) and @copr/copr-dev (target: @copr_dev) (4f1a57e)
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 4f1a57ed2d134e08a3ce2ab9754eb61899ca2cdb
Author: clime <clime(a)redhat.com>
Date: Sat Jan 16 20:49:53 2016 +0100
tito releasers upadted to include new repos @copr/copr (target: @copr) and @copr/copr-dev (target: @copr_dev)
>---------------------------------------------------------------
rel-eng/releasers.conf | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf
index 7408662..7fb942f 100644
--- a/rel-eng/releasers.conf
+++ b/rel-eng/releasers.conf
@@ -23,6 +23,14 @@ releaser = tito.release.CoprReleaser
project_name = copr-dev
builder.test = 1
+[@copr]
+releaser = tito.release.CoprReleaser
+project_name = @copr/copr
+
+[@copr-dev]
+releaser = tito.release.CoprReleaser
+project_name = @copr/copr-dev
+builder.test = 1
[copr-vgologuz]
releaser = tito.release.CoprReleaser
8 years, 4 months
[copr] master: Automatic commit of package [copr-prune-repo] release [1.4-1]. (4e25fc7)
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 4e25fc79d65ddf66f87c4fc7bc9278502486ba99
Author: clime <clime(a)redhat.com>
Date: Sat Jan 16 18:48:28 2016 +0100
Automatic commit of package [copr-prune-repo] release [1.4-1].
>---------------------------------------------------------------
copr-prune-repo/copr-prune-repo.spec | 3 +++
copr-prune-repo/setup.py | 2 +-
rel-eng/packages/copr-prune-repo | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/copr-prune-repo/copr-prune-repo.spec b/copr-prune-repo/copr-prune-repo.spec
index 1defe79..60fbf0a 100644
--- a/copr-prune-repo/copr-prune-repo.spec
+++ b/copr-prune-repo/copr-prune-repo.spec
@@ -37,6 +37,9 @@ cp man/man1/copr_prune_repo.1 $RPM_BUILD_ROOT%{_mandir}/man1/
%doc %{_mandir}/man1/copr_prune_repo.1*
%changelog
+* Sat Jan 16 2016 clime <clime(a)redhat.com> 1.4-1
+- dnf cache bypassed by using --refresh for dnf repoquery
+
* Thu Jan 14 2016 clime <clime(a)redhat.com> 1.3-1
- dependency on yum-utils removed by using updated dnf repoquery plugin from
copr clime/dnf-plugins-repo (enable repo with: dnf copr enable clime/dnf-
diff --git a/copr-prune-repo/setup.py b/copr-prune-repo/setup.py
index 4114226..f35ada3 100755
--- a/copr-prune-repo/setup.py
+++ b/copr-prune-repo/setup.py
@@ -2,7 +2,7 @@
from distutils.core import setup
setup(name='copr-prune-repo',
- version='1.3',
+ version='1.4',
description='Remove failed and obsolete succeeded builds (with the associated packages) from a copr repository.',
author='clime',
author_email='micnovot(a)redhat.com',
diff --git a/rel-eng/packages/copr-prune-repo b/rel-eng/packages/copr-prune-repo
index dbe2245..894d6ed 100644
--- a/rel-eng/packages/copr-prune-repo
+++ b/rel-eng/packages/copr-prune-repo
@@ -1 +1 @@
-1.3-1 copr-prune-repo/
+1.4-1 copr-prune-repo/
8 years, 4 months
[copr] master: [copr-prune-repo] dnf cache bypassed by using --refresh for dnf repoquery (+ version update) (1fd99f2)
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 1fd99f21a7609056f5ace58527284ffa441d04b1
Author: clime <clime(a)redhat.com>
Date: Sat Jan 16 18:46:32 2016 +0100
[copr-prune-repo] dnf cache bypassed by using --refresh for dnf repoquery (+ version update)
>---------------------------------------------------------------
copr-prune-repo/copr-prune-repo.spec | 2 +-
copr-prune-repo/copr_prune_repo.py | 7 ++-
copr-prune-repo/man/man1/copr_prune_repo.1 | 4 +-
.../build-00151846.rsync.log | 0
.../build.info | 0
.../build.log.gz | Bin 1381 -> 1381 bytes
.../example-1.0.2-2.fc23.src.rpm | Bin 19741 -> 19741 bytes
.../example-1.0.2-2.fc23.x86_64.rpm | Bin 9758 -> 9758 bytes
.../example-debuginfo-1.0.2-2.fc23.x86_64.rpm | Bin 9458 -> 9458 bytes
.../mockchain.log.gz | Bin 2806 -> 2806 bytes
.../root.log.gz | Bin 16815 -> 16815 bytes
.../state.log.gz | Bin 238 -> 238 bytes
.../success | 0
.../build-00151846.rsync.log | 0
.../build.info | 0
.../build.log.gz | Bin 1381 -> 1381 bytes
.../7-success5-latest/example-1.0.3-2.fc23.src.rpm | Bin 0 -> 18803 bytes
.../example-1.0.3-2.fc23.x86_64.rpm | Bin 0 -> 9186 bytes
.../example-debuginfo-1.0.3-2.fc23.x86_64.rpm | Bin 0 -> 8886 bytes
.../mockchain.log.gz | Bin 2806 -> 2806 bytes
.../root.log.gz | Bin 16815 -> 16815 bytes
.../state.log.gz | Bin 238 -> 238 bytes
.../{1-success1 => 7-success5-latest}/success | 0
...c48c22db06aeb0667edd55ff3d13-primary.sqlite.bz2 | Bin 4074 -> 0 bytes
...c456517c887dea0a54f7448d58eadf-filelists.xml.gz | Bin 0 -> 1069 bytes
...f92340de90c4fe97420d301008781b2d49-other.xml.gz | Bin 0 -> 1080 bytes
...3cf76440db4af67e7bd25231940d71f6e7-other.xml.gz | Bin 934 -> 0 bytes
...5558fabe66e4646ddba80b929cda-primary.sqlite.bz2 | Bin 0 -> 4648 bytes
...f48b57a7de294b7d26b60332343425-other.sqlite.bz2 | Bin 0 -> 2343 bytes
...d54093d364c0e83f8482bc4565-filelists.sqlite.bz2 | Bin 2364 -> 0 bytes
...78cb4830764e695f9fda9db3c59abf4d-primary.xml.gz | Bin 1778 -> 0 bytes
...b83459f0b963186477b21ceadaab89-filelists.xml.gz | Bin 917 -> 0 bytes
...1fb45748058a43343d17b324eaa5cce8-primary.xml.gz | Bin 0 -> 2093 bytes
...924f27fe2859ba7ee36ebf5d00-filelists.sqlite.bz2 | Bin 0 -> 2698 bytes
...acbd5c18cadd59cda634619f2c541e-other.sqlite.bz2 | Bin 2095 -> 0 bytes
.../fedora-23-x86_64-template/repodata/repomd.xml | 74 ++++++++++----------
copr-prune-repo/tests/test.sh | 63 ++++++++++++----
37 files changed, 92 insertions(+), 58 deletions(-)
diff --git a/copr-prune-repo/copr-prune-repo.spec b/copr-prune-repo/copr-prune-repo.spec
index 1aa8193..1defe79 100644
--- a/copr-prune-repo/copr-prune-repo.spec
+++ b/copr-prune-repo/copr-prune-repo.spec
@@ -1,6 +1,6 @@
Summary: Remove failed and obsolete succeeded builds (with the associated packages) from a copr repository.
Name: copr-prune-repo
-Version: 1.3
+Version: 1.4
Release: 1%{?dist}
# Source is created by:
diff --git a/copr-prune-repo/copr_prune_repo.py b/copr-prune-repo/copr_prune_repo.py
index e9beab3..2d2ade4 100755
--- a/copr-prune-repo/copr_prune_repo.py
+++ b/copr-prune-repo/copr_prune_repo.py
@@ -21,7 +21,7 @@ parser.add_argument('--obsoleted', dest='removefailed', action='store_false',
help='only remove obsoleted builds (keep failed)')
parser.add_argument('--disableusercheck', dest='usercheckenabled', action='store_false',
help='do not check if the build directories belong to user `copr`')
-parser.add_argument('-v', '--version', action='version', version='1.3',
+parser.add_argument('-v', '--version', action='version', version='1.4',
help='print program version and exit')
args = parser.parse_args()
@@ -59,11 +59,14 @@ def get_latest_packages():
cmd = [
'dnf',
'repoquery',
+ '--disablerepo=*',
'--repofrompath=query,'+os.path.abspath(args.path),
'--repoid=query',
+ '--enablerepo=query',
+ '--refresh',
'--latest-limit=1',
'--queryformat="%{location}"',
- '--quiet'
+ '--quiet',
]
repoquery = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr= subprocess.PIPE)
(stdout, stderr) = repoquery.communicate()
diff --git a/copr-prune-repo/man/man1/copr_prune_repo.1 b/copr-prune-repo/man/man1/copr_prune_repo.1
index 7cfaa8c..94ae6c9 100644
--- a/copr-prune-repo/man/man1/copr_prune_repo.1
+++ b/copr-prune-repo/man/man1/copr_prune_repo.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
-.TH COPR_PRUNE_REPO.PY "1" "January 2016" "copr_prune_repo.py 1.3" "User Commands"
+.TH COPR_PRUNE_REPO.PY "1" "January 2016" "copr_prune_repo.py 1.4" "User Commands"
.SH NAME
-copr_prune_repo.py \- manual page for copr_prune_repo.py 1.3
+copr_prune_repo.py \- manual page for copr_prune_repo.py 1.4
.SH DESCRIPTION
usage: copr_prune_repo.py [\-h] [\-\-days DAYS] [\-\-failed] [\-\-obsoleted]
.TP
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build-00151846.rsync.log b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/build-00151846.rsync.log
similarity index 100%
copy from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build-00151846.rsync.log
copy to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/build-00151846.rsync.log
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build.info b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/build.info
similarity index 100%
copy from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build.info
copy to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/build.info
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build.log.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/build.log.gz
similarity index 100%
copy from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build.log.gz
copy to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/build.log.gz
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/example-1.0.2-2.fc23.src.rpm b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/example-1.0.2-2.fc23.src.rpm
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/example-1.0.2-2.fc23.src.rpm
rename to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/example-1.0.2-2.fc23.src.rpm
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/example-1.0.2-2.fc23.x86_64.rpm b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/example-1.0.2-2.fc23.x86_64.rpm
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/example-1.0.2-2.fc23.x86_64.rpm
rename to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/example-1.0.2-2.fc23.x86_64.rpm
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/example-debuginfo-1.0.2-2.fc23.x86_64.rpm b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/example-debuginfo-1.0.2-2.fc23.x86_64.rpm
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/example-debuginfo-1.0.2-2.fc23.x86_64.rpm
rename to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/example-debuginfo-1.0.2-2.fc23.x86_64.rpm
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/mockchain.log.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/mockchain.log.gz
similarity index 100%
copy from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/mockchain.log.gz
copy to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/mockchain.log.gz
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/root.log.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/root.log.gz
similarity index 100%
copy from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/root.log.gz
copy to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/root.log.gz
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/state.log.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/state.log.gz
similarity index 100%
copy from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/state.log.gz
copy to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/state.log.gz
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/success b/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/success
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/success
rename to copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-seclatest/success
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build-00151846.rsync.log b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/build-00151846.rsync.log
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build-00151846.rsync.log
rename to copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/build-00151846.rsync.log
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build.info b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/build.info
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build.info
rename to copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/build.info
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build.log.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/build.log.gz
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/build.log.gz
rename to copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/build.log.gz
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/example-1.0.3-2.fc23.src.rpm b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/example-1.0.3-2.fc23.src.rpm
new file mode 100644
index 0000000..0930102
Binary files /dev/null and b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/example-1.0.3-2.fc23.src.rpm differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/example-1.0.3-2.fc23.x86_64.rpm b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/example-1.0.3-2.fc23.x86_64.rpm
new file mode 100644
index 0000000..cfb5660
Binary files /dev/null and b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/example-1.0.3-2.fc23.x86_64.rpm differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/example-debuginfo-1.0.3-2.fc23.x86_64.rpm b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/example-debuginfo-1.0.3-2.fc23.x86_64.rpm
new file mode 100644
index 0000000..69a6ebf
Binary files /dev/null and b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/example-debuginfo-1.0.3-2.fc23.x86_64.rpm differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/mockchain.log.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/mockchain.log.gz
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/mockchain.log.gz
rename to copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/mockchain.log.gz
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/root.log.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/root.log.gz
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/root.log.gz
rename to copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/root.log.gz
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/state.log.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/state.log.gz
similarity index 100%
rename from copr-prune-repo/tests/fedora-23-x86_64-template/6-success4-latestpkg/state.log.gz
rename to copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/state.log.gz
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/1-success1/success b/copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/success
similarity index 100%
copy from copr-prune-repo/tests/fedora-23-x86_64-template/1-success1/success
copy to copr-prune-repo/tests/fedora-23-x86_64-template/7-success5-latest/success
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/02642d3bc9721d317f9786245e275ea755ccc48c22db06aeb0667edd55ff3d13-primary.sqlite.bz2 b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/02642d3bc9721d317f9786245e275ea755ccc48c22db06aeb0667edd55ff3d13-primary.sqlite.bz2
deleted file mode 100644
index d14f8dc..0000000
Binary files a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/02642d3bc9721d317f9786245e275ea755ccc48c22db06aeb0667edd55ff3d13-primary.sqlite.bz2 and /dev/null differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/0e3785bacfc59424289fd698902e3f7570c456517c887dea0a54f7448d58eadf-filelists.xml.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/0e3785bacfc59424289fd698902e3f7570c456517c887dea0a54f7448d58eadf-filelists.xml.gz
new file mode 100644
index 0000000..e3783a6
Binary files /dev/null and b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/0e3785bacfc59424289fd698902e3f7570c456517c887dea0a54f7448d58eadf-filelists.xml.gz differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/1d9e46c65021a37aba8bb9242ac355f92340de90c4fe97420d301008781b2d49-other.xml.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/1d9e46c65021a37aba8bb9242ac355f92340de90c4fe97420d301008781b2d49-other.xml.gz
new file mode 100644
index 0000000..7b6a825
Binary files /dev/null and b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/1d9e46c65021a37aba8bb9242ac355f92340de90c4fe97420d301008781b2d49-other.xml.gz differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/1e597300952f31454d0fe08f2274463cf76440db4af67e7bd25231940d71f6e7-other.xml.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/1e597300952f31454d0fe08f2274463cf76440db4af67e7bd25231940d71f6e7-other.xml.gz
deleted file mode 100644
index 09bb5f9..0000000
Binary files a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/1e597300952f31454d0fe08f2274463cf76440db4af67e7bd25231940d71f6e7-other.xml.gz and /dev/null differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/59cb852527ede2dc91a23c25180ef3a714a55558fabe66e4646ddba80b929cda-primary.sqlite.bz2 b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/59cb852527ede2dc91a23c25180ef3a714a55558fabe66e4646ddba80b929cda-primary.sqlite.bz2
new file mode 100644
index 0000000..76093fd
Binary files /dev/null and b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/59cb852527ede2dc91a23c25180ef3a714a55558fabe66e4646ddba80b929cda-primary.sqlite.bz2 differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/5b7087cd2ea84b50bc19ff2e7cc5dfd9aff48b57a7de294b7d26b60332343425-other.sqlite.bz2 b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/5b7087cd2ea84b50bc19ff2e7cc5dfd9aff48b57a7de294b7d26b60332343425-other.sqlite.bz2
new file mode 100644
index 0000000..4fc8872
Binary files /dev/null and b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/5b7087cd2ea84b50bc19ff2e7cc5dfd9aff48b57a7de294b7d26b60332343425-other.sqlite.bz2 differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/7dd85621bb5d6e78da41d9482a123436f00643d54093d364c0e83f8482bc4565-filelists.sqlite.bz2 b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/7dd85621bb5d6e78da41d9482a123436f00643d54093d364c0e83f8482bc4565-filelists.sqlite.bz2
deleted file mode 100644
index 44ec1c1..0000000
Binary files a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/7dd85621bb5d6e78da41d9482a123436f00643d54093d364c0e83f8482bc4565-filelists.sqlite.bz2 and /dev/null differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/857af547e6d03ec64d44d1a91dfebb2478cb4830764e695f9fda9db3c59abf4d-primary.xml.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/857af547e6d03ec64d44d1a91dfebb2478cb4830764e695f9fda9db3c59abf4d-primary.xml.gz
deleted file mode 100644
index 77c1d32..0000000
Binary files a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/857af547e6d03ec64d44d1a91dfebb2478cb4830764e695f9fda9db3c59abf4d-primary.xml.gz and /dev/null differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/b695aea28331d6b9ec525acfb392fda6ffb83459f0b963186477b21ceadaab89-filelists.xml.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/b695aea28331d6b9ec525acfb392fda6ffb83459f0b963186477b21ceadaab89-filelists.xml.gz
deleted file mode 100644
index 4b68286..0000000
Binary files a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/b695aea28331d6b9ec525acfb392fda6ffb83459f0b963186477b21ceadaab89-filelists.xml.gz and /dev/null differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/c6bf3d9c5a6124fa06af45426df617391fb45748058a43343d17b324eaa5cce8-primary.xml.gz b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/c6bf3d9c5a6124fa06af45426df617391fb45748058a43343d17b324eaa5cce8-primary.xml.gz
new file mode 100644
index 0000000..a757ae5
Binary files /dev/null and b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/c6bf3d9c5a6124fa06af45426df617391fb45748058a43343d17b324eaa5cce8-primary.xml.gz differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/d3653246d4a5cbc84c16e429b522c6a7fc3026924f27fe2859ba7ee36ebf5d00-filelists.sqlite.bz2 b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/d3653246d4a5cbc84c16e429b522c6a7fc3026924f27fe2859ba7ee36ebf5d00-filelists.sqlite.bz2
new file mode 100644
index 0000000..799a849
Binary files /dev/null and b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/d3653246d4a5cbc84c16e429b522c6a7fc3026924f27fe2859ba7ee36ebf5d00-filelists.sqlite.bz2 differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/d5b01932c158eaed37f94ab902849cca2bacbd5c18cadd59cda634619f2c541e-other.sqlite.bz2 b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/d5b01932c158eaed37f94ab902849cca2bacbd5c18cadd59cda634619f2c541e-other.sqlite.bz2
deleted file mode 100644
index 4c4614f..0000000
Binary files a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/d5b01932c158eaed37f94ab902849cca2bacbd5c18cadd59cda634619f2c541e-other.sqlite.bz2 and /dev/null differ
diff --git a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/repomd.xml b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/repomd.xml
index 76de435..d596fa8 100644
--- a/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/repomd.xml
+++ b/copr-prune-repo/tests/fedora-23-x86_64-template/repodata/repomd.xml
@@ -1,55 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
- <revision>1452180926</revision>
+ <revision>1452965586</revision>
<data type="primary">
- <checksum type="sha256">857af547e6d03ec64d44d1a91dfebb2478cb4830764e695f9fda9db3c59abf4d</checksum>
- <open-checksum type="sha256">2f6aeb65d90f42a4f79dec35b50045eebdb8851c29184393f6bc7b3064e28aea</open-checksum>
- <location href="repodata/857af547e6d03ec64d44d1a91dfebb2478cb4830764e695f9fda9db3c59abf4d-primary.xml.gz"/>
- <timestamp>1452180926</timestamp>
- <size>1778</size>
- <open-size>14643</open-size>
+ <checksum type="sha256">c6bf3d9c5a6124fa06af45426df617391fb45748058a43343d17b324eaa5cce8</checksum>
+ <open-checksum type="sha256">da8e572d640896cf3e001f05b89ee6079d097a1d6ddd2df6af8919426719ac2b</open-checksum>
+ <location href="repodata/c6bf3d9c5a6124fa06af45426df617391fb45748058a43343d17b324eaa5cce8-primary.xml.gz"/>
+ <timestamp>1452965586</timestamp>
+ <size>2093</size>
+ <open-size>18141</open-size>
</data>
<data type="filelists">
- <checksum type="sha256">b695aea28331d6b9ec525acfb392fda6ffb83459f0b963186477b21ceadaab89</checksum>
- <open-checksum type="sha256">258e17f629416582441105946115d41ff55eb8e9ea6973fd94655cbd4e72d480</open-checksum>
- <location href="repodata/b695aea28331d6b9ec525acfb392fda6ffb83459f0b963186477b21ceadaab89-filelists.xml.gz"/>
- <timestamp>1452180926</timestamp>
- <size>917</size>
- <open-size>4426</open-size>
+ <checksum type="sha256">0e3785bacfc59424289fd698902e3f7570c456517c887dea0a54f7448d58eadf</checksum>
+ <open-checksum type="sha256">53fb801f1cd7b23e304a07ffcd379d02a530eb994dbcda47b942668d159ae49b</open-checksum>
+ <location href="repodata/0e3785bacfc59424289fd698902e3f7570c456517c887dea0a54f7448d58eadf-filelists.xml.gz"/>
+ <timestamp>1452965586</timestamp>
+ <size>1069</size>
+ <open-size>5501</open-size>
</data>
<data type="other">
- <checksum type="sha256">1e597300952f31454d0fe08f2274463cf76440db4af67e7bd25231940d71f6e7</checksum>
- <open-checksum type="sha256">88736a55abb086a479da10676b71d0ec77724b7e7fc7758b93894530668e0c9a</open-checksum>
- <location href="repodata/1e597300952f31454d0fe08f2274463cf76440db4af67e7bd25231940d71f6e7-other.xml.gz"/>
- <timestamp>1452180926</timestamp>
- <size>934</size>
- <open-size>5538</open-size>
+ <checksum type="sha256">1d9e46c65021a37aba8bb9242ac355f92340de90c4fe97420d301008781b2d49</checksum>
+ <open-checksum type="sha256">aaf5728d3b953f8fec6783eeab1daa4d7f6931e61e045f7c08fdd73ee8aeb9c0</open-checksum>
+ <location href="repodata/1d9e46c65021a37aba8bb9242ac355f92340de90c4fe97420d301008781b2d49-other.xml.gz"/>
+ <timestamp>1452965586</timestamp>
+ <size>1080</size>
+ <open-size>6892</open-size>
</data>
<data type="primary_db">
- <checksum type="sha256">02642d3bc9721d317f9786245e275ea755ccc48c22db06aeb0667edd55ff3d13</checksum>
- <open-checksum type="sha256">8cdc5875d398ffdf2a251999446a7573aef34e6627df6460f37c618f0a83fb8a</open-checksum>
- <location href="repodata/02642d3bc9721d317f9786245e275ea755ccc48c22db06aeb0667edd55ff3d13-primary.sqlite.bz2"/>
- <timestamp>1452180926</timestamp>
- <size>4074</size>
- <open-size>38912</open-size>
+ <checksum type="sha256">59cb852527ede2dc91a23c25180ef3a714a55558fabe66e4646ddba80b929cda</checksum>
+ <open-checksum type="sha256">a99acefd092614ed43666e8ac1a110f8f1ede13b534a4830859e29cc1fac2fec</open-checksum>
+ <location href="repodata/59cb852527ede2dc91a23c25180ef3a714a55558fabe66e4646ddba80b929cda-primary.sqlite.bz2"/>
+ <timestamp>1452965586</timestamp>
+ <size>4648</size>
+ <open-size>43008</open-size>
<database_version>10</database_version>
</data>
<data type="filelists_db">
- <checksum type="sha256">7dd85621bb5d6e78da41d9482a123436f00643d54093d364c0e83f8482bc4565</checksum>
- <open-checksum type="sha256">4cedd6dddcdcf2d42fce77081341f3cc87632d3051864de7a3f5ca8b1449f5f5</open-checksum>
- <location href="repodata/7dd85621bb5d6e78da41d9482a123436f00643d54093d364c0e83f8482bc4565-filelists.sqlite.bz2"/>
- <timestamp>1452180926</timestamp>
- <size>2364</size>
- <open-size>9216</open-size>
+ <checksum type="sha256">d3653246d4a5cbc84c16e429b522c6a7fc3026924f27fe2859ba7ee36ebf5d00</checksum>
+ <open-checksum type="sha256">53a7863d6e3fedf02deca9c66cbbd7732b53f46b962001064c6669cbd8773f2e</open-checksum>
+ <location href="repodata/d3653246d4a5cbc84c16e429b522c6a7fc3026924f27fe2859ba7ee36ebf5d00-filelists.sqlite.bz2"/>
+ <timestamp>1452965586</timestamp>
+ <size>2698</size>
+ <open-size>13312</open-size>
<database_version>10</database_version>
</data>
<data type="other_db">
- <checksum type="sha256">d5b01932c158eaed37f94ab902849cca2bacbd5c18cadd59cda634619f2c541e</checksum>
- <open-checksum type="sha256">3d96236dc7f27038165e9fd03a28305819bf24efa03821e0bc7fbbc53820af1f</open-checksum>
- <location href="repodata/d5b01932c158eaed37f94ab902849cca2bacbd5c18cadd59cda634619f2c541e-other.sqlite.bz2"/>
- <timestamp>1452180926</timestamp>
- <size>2095</size>
- <open-size>9216</open-size>
+ <checksum type="sha256">5b7087cd2ea84b50bc19ff2e7cc5dfd9aff48b57a7de294b7d26b60332343425</checksum>
+ <open-checksum type="sha256">c2ef1ccdce39a683d1a74f87c52ed9afcf7317dc7c3c03ea7348b7c679918eae</open-checksum>
+ <location href="repodata/5b7087cd2ea84b50bc19ff2e7cc5dfd9aff48b57a7de294b7d26b60332343425-other.sqlite.bz2"/>
+ <timestamp>1452965586</timestamp>
+ <size>2343</size>
+ <open-size>13312</open-size>
<database_version>10</database_version>
</data>
</repomd>
diff --git a/copr-prune-repo/tests/test.sh b/copr-prune-repo/tests/test.sh
index 113a3c4..5ebab19 100755
--- a/copr-prune-repo/tests/test.sh
+++ b/copr-prune-repo/tests/test.sh
@@ -3,7 +3,7 @@
alias RUNCMD='../copr_prune_repo.py'
shopt -s expand_aliases
-die() { echo "$@" 1>&2 ; exit 1; }
+#die() { echo "$@" 1>&2 ; exit 1; }
# repo builds:
# drwxrwxr-x. 2 copr copr 4096 Jan 1 00:00 1-success1
@@ -11,11 +11,12 @@ die() { echo "$@" 1>&2 ; exit 1; }
# drwxrwxr-x. 2 clime clime 4096 Jan 3 00:00 3-fail1-baduser
# drwxrwxr-x. 2 copr copr 4096 Jan 4 00:00 4-fail2
# drwxrwxr-x. 2 copr copr 4096 Jan 5 00:00 5-success3
-# drwxrwxr-x. 2 copr copr 4096 Jan 6 00:00 6-success4-latestpkg
+# drwxrwxr-x. 2 copr copr 4096 Jan 6 00:00 6-success4-seclatest
+# drwxrwxr-x. 2 copr copr 4096 Jan 7 00:00 7-success5-latest
origrepo=./fedora-23-x86_64-template
testrepo=./fedora-23-x86_64-test
-alias lsbuilds="ls -dr $testrepo/1-success1 $testrepo/2-success2 $testrepo/3-fail1-baduser $testrepo/4-fail2 $testrepo/5-success3 $testrepo/6-success4-latestpkg 2> /dev/null"
+alias lsbuilds="ls -dr $testrepo/1-success1 $testrepo/2-success2 $testrepo/3-fail1-baduser $testrepo/4-fail2 $testrepo/5-success3 $testrepo/6-success4-seclatest $testrepo/7-success5-latest 2> /dev/null"
function setup {
set +x
@@ -33,7 +34,7 @@ function setup {
# && - expect missing
# || - expect present
-set +x; echo "============================ test1 ============================"; set -x;
+set +x; echo "============================ test basic usecase ============================"; set -x;
setup
RUNCMD $testrepo
@@ -42,9 +43,10 @@ lsbuilds | grep success2 && exit 1
lsbuilds | grep fail1-baduser || exit 1
lsbuilds | grep fail2 && exit 1
lsbuilds | grep success3 && exit 1
-lsbuilds | grep success4-latestpkg || exit 1
+lsbuilds | grep success4-seclatest && exit 1
+lsbuilds | grep success5-latest || exit 1
-set +x; echo "============================ test2 ============================"; set -x;
+set +x; echo "============================ test --disableusercheck ============================"; set -x;
setup
RUNCMD --disableusercheck $testrepo
@@ -53,20 +55,22 @@ lsbuilds | grep success2 && exit 1
lsbuilds | grep fail1-baduser && exit 1
lsbuilds | grep fail2 && exit 1
lsbuilds | grep success3 && exit 1
-lsbuilds | grep success4-latestpkg || exit 1
+lsbuilds | grep success4-seclatest && exit 1
+lsbuilds | grep success5-latest || exit 1
-set +x; echo "============================ test3 ============================"; set -x;
+set +x; echo "============================ test --days ============================"; set -x;
setup
-RUNCMD --disableusercheck --days 6 $testrepo
+RUNCMD --disableusercheck --days 7 $testrepo
lsbuilds | grep success1 && exit 1
lsbuilds | grep success2 || exit 1
lsbuilds | grep fail1-baduser || exit 1
lsbuilds | grep fail2 || exit 1
lsbuilds | grep success3 || exit 1
-lsbuilds | grep success4-latestpkg || exit 1
+lsbuilds | grep success4-seclatest || exit 1
+lsbuilds | grep success5-latest || exit 1
-set +x; echo "============================ test4 ============================"; set -x;
+set +x; echo "============================ test --failed ============================"; set -x;
setup
RUNCMD --disableusercheck --failed $testrepo
@@ -75,9 +79,10 @@ lsbuilds | grep success2 || exit 1
lsbuilds | grep fail1-baduser && exit 1
lsbuilds | grep fail2 && exit 1
lsbuilds | grep success3 || exit 1
-lsbuilds | grep success4-latestpkg || exit 1
+lsbuilds | grep success4-seclatest || exit 1
+lsbuilds | grep success5-latest || exit 1
-set +x; echo "============================ test5 ============================"; set -x;
+set +x; echo "============================ test --obsolete ============================"; set -x;
setup
RUNCMD --disableusercheck --obsolete $testrepo
@@ -86,9 +91,10 @@ lsbuilds | grep success2 && exit 1
lsbuilds | grep fail1-baduser || exit 1
lsbuilds | grep fail2 || exit 1
lsbuilds | grep success3 && exit 1
-lsbuilds | grep success4-latestpkg || exit 1
+lsbuilds | grep success4-seclatest && exit 1
+lsbuilds | grep success5-latest || exit 1
-set +x; echo "============================ test6 ============================"; set -x;
+set +x; echo "============================ test no build.info in builddir ============================"; set -x;
setup
find $testrepo | grep success1/build.info | xargs rm
@@ -98,6 +104,31 @@ lsbuilds | grep success2 && exit 1
lsbuilds | grep fail1-baduser || exit 1
lsbuilds | grep fail2 && exit 1
lsbuilds | grep success3 && exit 1
-lsbuilds | grep success4-latestpkg || exit 1
+lsbuilds | grep success4-seclatest && exit 1
+lsbuilds | grep success5-latest || exit 1
+
+set +x; echo "============================ test dnf cache always fresh ============================"; set -x;
+
+setup
+RUNCMD $testrepo
+lsbuilds | grep success1 && exit 1
+lsbuilds | grep success2 && exit 1
+lsbuilds | grep fail1-baduser || exit 1
+lsbuilds | grep fail2 && exit 1
+lsbuilds | grep success3 && exit 1
+lsbuilds | grep success4-seclatest && exit 1
+lsbuilds | grep success5-latest || exit 1
+
+setup
+rm -r $testrepo/7-success5-latest
+createrepo_c $testrepo
+RUNCMD $testrepo
+lsbuilds | grep success1 && exit 1
+lsbuilds | grep success2 && exit 1
+lsbuilds | grep fail1-baduser || exit 1
+lsbuilds | grep fail2 && exit 1
+lsbuilds | grep success3 && exit 1
+lsbuilds | grep success4-seclatest || exit 1
+lsbuilds | grep success5-latest && exit 1
exit 0
8 years, 4 months
[copr] master: Automatic commit of package [copr-dist-git] release [0.10-1]. (8f20692)
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 8f20692e1f8b21fb9a3be2854fbe08b3aeaa1539
Author: clime <clime(a)redhat.com>
Date: Sat Jan 16 15:19:31 2016 +0100
Automatic commit of package [copr-dist-git] release [0.10-1].
>---------------------------------------------------------------
dist-git/copr-dist-git.spec | 6 +++++-
rel-eng/packages/copr-dist-git | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dist-git/copr-dist-git.spec b/dist-git/copr-dist-git.spec
index 27429c5..63b7e1c 100644
--- a/dist-git/copr-dist-git.spec
+++ b/dist-git/copr-dist-git.spec
@@ -1,5 +1,5 @@
Name: copr-dist-git
-Version: 0.9
+Version: 0.10
Release: 1%{?dist}
Summary: Copr services for Dist Git server
@@ -100,6 +100,10 @@ restorecon -rv /var/lib/copr-dist-git
%ghost %{_var}/log/copr-dist-git/*.log
%changelog
+* Sat Jan 16 2016 clime <clime(a)redhat.com> 0.10-1
+- fixed do_import test
+- workaround for BZ 1283101
+
* Mon Nov 16 2015 Miroslav Such�� <msuchy(a)redhat.com> 0.9-1
- make more abstract exceptions
- implement support for multiple Mock SCMs
diff --git a/rel-eng/packages/copr-dist-git b/rel-eng/packages/copr-dist-git
index b1e0d88..f3dd6ef 100644
--- a/rel-eng/packages/copr-dist-git
+++ b/rel-eng/packages/copr-dist-git
@@ -1 +1 @@
-0.9-1 dist-git/
+0.10-1 dist-git/
8 years, 4 months
[copr] master: [dist-git] fixed do_import test (6f75827)
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 6f758270706c13c80bed5ef837dfb1cb4f5c26b8
Author: clime <clime(a)redhat.com>
Date: Sat Jan 16 15:12:10 2016 +0100
[dist-git] fixed do_import test
>---------------------------------------------------------------
dist-git/tests/test_dist_git_importer.py | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dist-git/tests/test_dist_git_importer.py b/dist-git/tests/test_dist_git_importer.py
index 9f35726..bef43c6 100644
--- a/dist-git/tests/test_dist_git_importer.py
+++ b/dist-git/tests/test_dist_git_importer.py
@@ -40,8 +40,8 @@ def mc_time():
@pytest.yield_fixture
-def mc_do_srpm_fetch():
- with mock.patch("{}.do_srpm_fetch".format(MODULE_REF)) as handle:
+def mc_SourceProvider():
+ with mock.patch("{}.SourceProvider".format(MODULE_REF)) as handle:
yield handle
@@ -286,9 +286,8 @@ class TestDistGitImporter(object):
self.dgi.post_back_safe(dd)
assert mc_post.called
- def test_do_import(self, mc_do_srpm_fetch):
+ def test_do_import(self, mc_SourceProvider):
internal_methods = [
- # "fetch_srpm",
"pkg_name_evr",
"before_git_import",
"git_import_srpm",
8 years, 4 months
[copr] master: [frontend] fix recent builds view (54c34b3)
by asamalik@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 54c34b3f082de3ddae37796c104c0f8ec9ba5014
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Fri Jan 15 15:38:26 2016 +0100
[frontend] fix recent builds view
>---------------------------------------------------------------
.../coprs_frontend/coprs/templates/recent/all.html | 38 +++++++++----------
.../coprs_frontend/coprs/templates/recent/my.html | 2 +-
2 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/templates/recent/all.html b/frontend/coprs_frontend/coprs/templates/recent/all.html
index c40a213..8a0f472 100644
--- a/frontend/coprs_frontend/coprs/templates/recent/all.html
+++ b/frontend/coprs_frontend/coprs/templates/recent/all.html
@@ -22,31 +22,29 @@
</tr>
</thead>
<tbody>
- {% for build in builds %}
- <tr>
- <td>
- <a href="{{ build_href(build) }}"><b>{{ build.id }}</b></a>
- </td>
- <td>
- <a href="{{ copr_details_href(build.copr) }}">{{ copr_name(build.copr) }}
- </a>
- <td>
- {{ build.package.name}}
- </td>
- <td>
- {{ build.package.version}}
- </td>
- <td>
- <td data-order="{{build.submitted_on}}"> {{ build.ended_on|time_ago() }} ago </td>
- </td>
- <td>
+ {% for build in builds %}
+ <tr>
+ <td>
+ <a href="{{ build_href(build) }}"><b>{{ build.id }}</b></a>
+ </td>
+ <td>
+ <a href="{{ copr_details_href(build.copr) }}">{{ copr_name(build.copr) }}
+ </a>
+ <td>
+ {{ build.package.name}}
+ </td>
+ <td>
+ {{ build.pkg_version}}
+ </td>
+ <td>
+ {{ build.ended_on|time_ago() }} ago
+ </td>
{% if build.canceled %}
<td class="build-canceled">canceled</td>
{% else %}
<td class="build-{{build.status | state_from_num }}" abbr="{{build.status | state_from_num | build_state_description}}">{{ build.status | state_from_num }}</td>
{% endif %}
- </td>
- </tr>
+ </tr>
{% endfor %}
</tbody>
</table>
diff --git a/frontend/coprs_frontend/coprs/templates/recent/my.html b/frontend/coprs_frontend/coprs/templates/recent/my.html
index c270143..f385aba 100644
--- a/frontend/coprs_frontend/coprs/templates/recent/my.html
+++ b/frontend/coprs_frontend/coprs/templates/recent/my.html
@@ -34,7 +34,7 @@
{{ build.package.name}}
</td>
<td>
- {{ build.package.version}}
+ {{ build.pkg_version}}
</td>
<td>
{{ build.ended_on|time_ago() }} ago
8 years, 4 months
[copr] master: [frontend] recent pages (f58b077)
by asamalik@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit f58b0770815a633aacef40b5f866d08b325d367c
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Fri Jan 15 14:13:03 2016 +0100
[frontend] recent pages
>---------------------------------------------------------------
frontend/coprs_frontend/coprs/static/copr.css | 1 +
.../coprs_frontend/coprs/templates/_helpers.html | 2 +-
.../coprs_frontend/coprs/templates/recent.html | 108 ++++---------------
.../templates/{recent.html => recent.html.bak} | 0
.../coprs_frontend/coprs/templates/recent/all.html | 54 ++++++++++
.../coprs_frontend/coprs/templates/recent/my.html | 54 ++++++++++
.../coprs/views/recent_ns/recent_general.py | 23 ++++-
7 files changed, 154 insertions(+), 88 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/static/copr.css b/frontend/coprs_frontend/coprs/static/copr.css
index 5724557..7d1c414 100644
--- a/frontend/coprs_frontend/coprs/static/copr.css
+++ b/frontend/coprs_frontend/coprs/static/copr.css
@@ -98,6 +98,7 @@ footer > div{
div.breadcrumb-panel {
background-color: #eee;
+ border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
diff --git a/frontend/coprs_frontend/coprs/templates/_helpers.html b/frontend/coprs_frontend/coprs/templates/_helpers.html
index 164761d..447c830 100644
--- a/frontend/coprs_frontend/coprs/templates/_helpers.html
+++ b/frontend/coprs_frontend/coprs/templates/_helpers.html
@@ -223,7 +223,7 @@
{% macro recent_builds_panel(builds) %}
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title"> Recent Builds </h3>
+ <h3 class="panel-title"> Recent Builds - <a href="{{ url_for('recent_ns.all') }}">View All</a></h3>
</div>
<div class="list-group">
{% for build in builds %}
diff --git a/frontend/coprs_frontend/coprs/templates/recent.html b/frontend/coprs_frontend/coprs/templates/recent.html
index d1381be..55e9602 100644
--- a/frontend/coprs_frontend/coprs/templates/recent.html
+++ b/frontend/coprs_frontend/coprs/templates/recent.html
@@ -1,91 +1,29 @@
{% extends "layout.html" %}
{% block title %} Recent builds - Copr {% endblock %}
{% block header %} Recent builds - Copr {% endblock %}
+{%block main_menu_status %}active{% endblock %}
+{% block breadcrumbs %}
+<ol class="breadcrumb">
+ <li>
+ <a href="{{ url_for('coprs_ns.coprs_show') }}">Home</a>
+ </li>
+ <li>
+ <a href="{{ url_for('recent_ns.all') }}">Recent Builds</a>
+ </li>
+ {%block status_breadcrumb %}{%endblock%}
+</ol>
+{% endblock %}
{% block body %}
-<h1> Recent builds </h1>
-
-{% if g.user %}
-<h2> Your projects </h2>
-<table class="status-table">
- <tr>
- <th>Build</th>
- <th>Finished</th>
- <th>Project</th>
- <th>Packages</th>
- <th>Repo</th>
- <th>Status</th>
- </tr>
-
- {% for build in user_builds %}
- <tr>
- <td><a href="{{ url_for('coprs_ns.copr_build', username = build.copr.owner.name, coprname = build.copr.name, build_id = build.id) }}">
- {{build.id}}
- </a></td>
-
-
- <td>{{ build.ended_on | localized_time(g.user.timezone) }}</td>
-
- <td><a href="{{ url_for('coprs_ns.copr_detail', username = build.copr.owner.name, coprname = build.copr.name) }}">
- {{build.copr.owner.name}}/{{build.copr.name}}
- </a></td>
-
-
- <td>{{ build.pkgs | pkg_name }} </td>
-
- <td><a href="{{ build.results }}">
- {{build.copr.owner.name}}/{{build.copr.name}}
- </a></td>
-
- <td>
- {{ build.state }}
- </td>
- </tr>
- {% endfor %}
-</table>
-
-
-
-{% endif %}
-
-<h2> All projects </h2>
-<table class="status-table">
- <tr>
- <th>Build</th>
- <th>Finished</th>
- <th>Project</th>
- <th>Packages</th>
- <th>Repo</th>
- <th>Status</th>
- </tr>
-
-
-
- {% for build in builds %}
- <tr>
- <td><a href="{{ url_for('coprs_ns.copr_build', username = build.copr.owner.name, coprname = build.copr.name, build_id = build.id) }}">
- {{build.id}}
- </a></td>
-
-
- <td>{{ build.ended_on | localized_time(g.user.timezone) }}</td>
-
- <td><a href="{{ url_for('coprs_ns.copr_detail', username = build.copr.owner.name, coprname = build.copr.name) }}">
- {{build.copr.owner.name}}/{{build.copr.name}}
- </a></td>
-
-
- <td>{{ build.pkgs | pkg_name }} </td>
-
- <td><a href="{{ build.results }}">
- {{build.copr.owner.name}}/{{build.copr.name}}
- </a></td>
-
- <td>
- {{ build.state }}
- </td>
- </tr>
- {% endfor %}
-</table>
-
+<h1> Recent Builds </h1>
+<ul class="nav nav-tabs">
+ <li class="{% block all_selected %}{% endblock %}">
+ <a href="{{ url_for('recent_ns.all') }}">All Projects</a>
+ </li>
+ {% if g.user %}
+ <li class="{% block my_selected %}{% endblock %}">
+ <a href="{{ url_for('recent_ns.my') }}">My Projects</a>
+ </li>
+ {% endif %}
+</ul>
{% block status_body %}{% endblock %}
{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/templates/recent.html b/frontend/coprs_frontend/coprs/templates/recent.html.bak
similarity index 100%
copy from frontend/coprs_frontend/coprs/templates/recent.html
copy to frontend/coprs_frontend/coprs/templates/recent.html.bak
diff --git a/frontend/coprs_frontend/coprs/templates/recent/all.html b/frontend/coprs_frontend/coprs/templates/recent/all.html
new file mode 100644
index 0000000..c40a213
--- /dev/null
+++ b/frontend/coprs_frontend/coprs/templates/recent/all.html
@@ -0,0 +1,54 @@
+{% extends "recent.html" %}
+{% from "_helpers.html" import build_href, copr_name, copr_details_href %}
+{% block all_selected %}active{% endblock %}
+{%block status_breadcrumb %}
+<li class="active">
+ All Projects
+</li>
+{%endblock%}
+{% block status_body %}
+
+<h2> All Projects </h2>
+
+<table class="table table-striped table-bordered">
+ <thead>
+ <tr>
+ <th>Build</th>
+ <th>Project</th>
+ <th>Package</th>
+ <th>Package Version</th>
+ <th>Finished</th>
+ <th>Status</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for build in builds %}
+ <tr>
+ <td>
+ <a href="{{ build_href(build) }}"><b>{{ build.id }}</b></a>
+ </td>
+ <td>
+ <a href="{{ copr_details_href(build.copr) }}">{{ copr_name(build.copr) }}
+ </a>
+ <td>
+ {{ build.package.name}}
+ </td>
+ <td>
+ {{ build.package.version}}
+ </td>
+ <td>
+ <td data-order="{{build.submitted_on}}"> {{ build.ended_on|time_ago() }} ago </td>
+ </td>
+ <td>
+ {% if build.canceled %}
+ <td class="build-canceled">canceled</td>
+ {% else %}
+ <td class="build-{{build.status | state_from_num }}" abbr="{{build.status | state_from_num | build_state_description}}">{{ build.status | state_from_num }}</td>
+ {% endif %}
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
+
+{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/templates/recent/my.html b/frontend/coprs_frontend/coprs/templates/recent/my.html
new file mode 100644
index 0000000..c8d4429
--- /dev/null
+++ b/frontend/coprs_frontend/coprs/templates/recent/my.html
@@ -0,0 +1,54 @@
+{% extends "recent.html" %}
+{% from "_helpers.html" import build_href, copr_name, copr_details_href %}
+{% block my_selected %}active{% endblock %}
+{%block status_breadcrumb %}
+<li class="active">
+ My Projects
+</li>
+{%endblock%}
+{% block status_body %}
+
+<h2> My Projects </h2>
+
+<table class="table table-striped table-bordered">
+ <thead>
+ <tr>
+ <th>Build</th>
+ <th>Project</th>
+ <th>Package</th>
+ <th>Package Version</th>
+ <th>Finished</th>
+ <th>Status</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for build in user_builds %}
+ <tr>
+ <td>
+ <a href="{{ build_href(build) }}"><b>{{ build.id }}</b></a>
+ </td>
+ <td>
+ <a href="{{ copr_details_href(build.copr) }}">{{ copr_name(build.copr) }}
+ </a>
+ <td>
+ {{ build.package.name}}
+ </td>
+ <td>
+ {{ build.package.version}}
+ </td>
+ <td>
+ <td data-order="{{build.submitted_on}}"> {{ build.ended_on|time_ago() }} ago </td>
+ </td>
+ <td>
+ {% if build.canceled %}
+ <td class="build-canceled">canceled</td>
+ {% else %}
+ <td class="build-{{build.status | state_from_num }}" abbr="{{build.status | state_from_num | build_state_description}}">{{ build.status | state_from_num }}</td>
+ {% endif %}
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
+
+{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/views/recent_ns/recent_general.py b/frontend/coprs_frontend/coprs/views/recent_ns/recent_general.py
index dd99b36..b86256a 100644
--- a/frontend/coprs_frontend/coprs/views/recent_ns/recent_general.py
+++ b/frontend/coprs_frontend/coprs/views/recent_ns/recent_general.py
@@ -2,6 +2,7 @@ import flask
from . import recent_ns
from coprs.logic import builds_logic
+from coprs.views.misc import login_required
import logging
@@ -9,7 +10,8 @@ log = logging.getLogger(__name__)
@recent_ns.route("/")
-def recent():
+(a)recent_ns.route("/all/")
+def all():
# tasks = bilds_logic.BuildsLogic.get_build_tasks(
builds = builds_logic.BuildsLogic.get_recent_tasks(limit=20)
# if flask.g:
@@ -19,7 +21,24 @@ def recent():
else:
user_builds = []
- return flask.render_template("recent.html",
+ return flask.render_template("recent/all.html",
+ number=len(list(builds)),
+ builds=builds,
+ user_builds=user_builds)
+
+(a)recent_ns.route("/my/")
+@login_required
+def my():
+ # tasks = bilds_logic.BuildsLogic.get_build_tasks(
+ builds = builds_logic.BuildsLogic.get_recent_tasks(limit=20)
+ # if flask.g:
+ # log.info("flask.g")\
+ if flask.g.user is not None:
+ user_builds = builds_logic.BuildsLogic.get_recent_tasks(user=flask.g.user, limit=20)
+ else:
+ user_builds = []
+
+ return flask.render_template("recent/my.html",
number=len(list(builds)),
builds=builds,
user_builds=user_builds)
8 years, 4 months
[copr] master: [frontend] edit chroot button fix (34c2f98)
by asamalik@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 34c2f980316810122321eca4d6669204558494a6
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Fri Jan 15 15:32:19 2016 +0100
[frontend] edit chroot button fix
>---------------------------------------------------------------
.../coprs/templates/coprs/_coprs_forms.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
index 0b7ee01..72a74a1 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
@@ -70,7 +70,7 @@
{{ form|attr(ch)|attr('label') }}
{% if copr and form|attr(ch)|attr('data') %}
{% set chrootname = form|attr(ch)|attr('label')|attr('text') %}
- <a class="btn btn-sm btn-default" href="{{ copr_url('coprs_ns.chroot_edit', copr, chrootname = chrootname)}}">
+ <a style="margin-left:20px" class="btn btn-xs btn-default" href="{{ copr_url('coprs_ns.chroot_edit', copr, chrootname = chrootname)}}">
<span class="pficon pficon-edit"> Edit </span>
</a>
{% endif %}
8 years, 4 months