rpms/plague/devel plague-0.3.1-match-enqueue-return-args.patch, NONE, 1.1 plague.spec, 1.1, 1.2
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Mon Aug 15 03:33:23 UTC 2005
- Previous message (by thread): extras-buildsys/server Config.py, NONE, 1.1 ArchJob.py, 1.10, 1.11 BuildMaster.py, 1.30, 1.31 Builder.py, 1.11, 1.12 BuilderManager.py, 1.11, 1.12 EmailUtils.py, 1.1, 1.2 Makefile, 1.6, 1.7 PackageJob.py, 1.21, 1.22 Repo.py, 1.11, 1.12 User.py, 1.6, 1.7 UserInterface.py, 1.44, 1.45 main.py, 1.11, 1.12 CONFIG.py, 1.21, NONE
- Next message (by thread): rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4745
Modified Files:
plague.spec
Added Files:
plague-0.3.1-match-enqueue-return-args.patch
Log Message:
* Sun Aug 14 2005 Dan Williams <dcbw at redhat.com> 0.3.1-2
- Match return arguments for enqueue and enqueue_srpm so that errors are
properly returned
plague-0.3.1-match-enqueue-return-args.patch:
--- NEW FILE plague-0.3.1-match-enqueue-return-args.patch ---
--- plague-0.3.1/server/UserInterface.py.enqueue-fix 2005-08-14 23:27:44.000000000 -0400
+++ plague-0.3.1/server/UserInterface.py 2005-08-14 23:28:39.000000000 -0400
@@ -135,24 +135,24 @@
if config_opts['use_srpm_not_cvs'] == True:
email_result(email, cvs_tag, "Error setting up build for %s on "\
"%s: this server builds SRPMs, not CVS checkouts." % (cvs_tag, target))
- return (-1, "This build server is set up for building SRPMS only. Use the 'enqueue_srpm' command instead.")
+ return (-1, "This build server is set up for building SRPMS only. Use the 'enqueue_srpm' command instead.", -1)
if not validate_package_name(package):
email_result(email, cvs_tag, "Error setting up build for %s on "\
"%s: Package name '%s' contained an illegal character. Submit a bug report?" % (cvs_tag, target, package))
- return (-1, "The package name contained an illegal character.")
+ return (-1, "The package name contained an illegal character.", -1)
if not validate_cvs_tag(cvs_tag):
email_result(email, cvs_tag, "Error setting up build for %s on "\
"%s: The CVS tag '%s' contained an illegal character. Submit a bug report?" % (package, target, cvs_tag))
- return (-1, "The CVS tag contained an illegal character.")
+ return (-1, "The CVS tag contained an illegal character.", -1)
try:
real_target = resolve_target(target)
except InvalidTargetError:
email_result(email, cvs_tag, "Error setting up build for %s on "\
"%s: target does not exist." % (cvs_tag, target))
- return (-1, "This build server does not support the target %s." % target)
+ return (-1, "This build server does not support the target %s." % target, -1)
else:
print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, cvs_tag, real_target, email)
req = self._bm.create_job_request(email, package, cvs_tag, real_target, buildreq, time.time())
@@ -166,31 +166,31 @@
if config_opts['use_srpm_not_cvs'] == False:
email_result(email, srpm_file, "Error setting up build for %s on "\
"%s: this server builds CVS checkouts, not SRPMS." % (srpm_file, target))
- return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.")
+ return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.", -1)
if not validate_package_name(package):
email_result(email, srpm_file, "Error setting up build for %s on "\
"%s: Package name '%s' contained an illegal character. Submit a bug report?" % (package, target, package))
- return (-1, "The package name contained an illegal character.")
+ return (-1, "The package name contained an illegal character.", -1)
# We limit the database field to 255 chars
if len(srpm_file) > 255:
email_result(email, srpm_file, "Error setting up build for %s on "\
"%s: try using a shorter path to the SRPM (< 255 chars)." % (srpm_file, target))
- return (-1, "Pathname to SRPM is limited to 255 characters.")
+ return (-1, "Pathname to SRPM is limited to 255 characters.", -1)
srpm_file = os.path.abspath(srpm_file)
if not srpm_file or not os.access(srpm_file, os.R_OK):
email_result(email, srpm_file, "Error setting up build for %s on "\
"%s: The SRPM does not exist, or is not accessible. Remember to use absolute paths." % (srpm_file, target))
- return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.")
+ return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.", -1)
try:
real_target = resolve_target(target)
except InvalidTargetError:
email_result(email, srpm_file, "Error setting up build for %s on "\
"%s: target does not exist." % (srpm_file, target))
- return (-1, "This build server does not support the target %s." % target)
+ return (-1, "This build server does not support the target %s." % target, -1)
else:
print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" % (package, srpm_file, real_target, email)
req = self._bm.create_job_request(email, package, srpm_file, real_target, buildreq, time.time())
Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plague.spec 11 Aug 2005 19:53:04 -0000 1.1
+++ plague.spec 15 Aug 2005 03:33:21 -0000 1.2
@@ -3,7 +3,7 @@
Summary: Distributed build system for RPMs
Name: plague
Version: 0.3.1
-Release: 1
+Release: 2
License: GPL
Group: Development/Tools
Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2
@@ -16,6 +16,8 @@
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
+Patch0: plague-0.3.1-match-enqueue-return-args.patch
+
%description
The Plague build system is a client/server distributed build system for
building RPM packages. This package provides the plague server.
@@ -66,6 +68,8 @@
%prep
%setup -q
+%patch0 -p1 -b .enqueue-fix
+
%build
make
@@ -146,6 +150,10 @@
%changelog
+* Sun Aug 14 2005 Dan Williams <dcbw at redhat.com> 0.3.1-2
+- Match return arguments for enqueue and enqueue_srpm so that errors are
+ properly returned
+
* Thu Aug 11 2005 Dan Williams <dcbw at redhat.com> 0.3.1-1
- Version 0.3.1
o Clean up web interface error handling, catches more errors
- Previous message (by thread): extras-buildsys/server Config.py, NONE, 1.1 ArchJob.py, 1.10, 1.11 BuildMaster.py, 1.30, 1.31 Builder.py, 1.11, 1.12 BuilderManager.py, 1.11, 1.12 EmailUtils.py, 1.1, 1.2 Makefile, 1.6, 1.7 PackageJob.py, 1.21, 1.22 Repo.py, 1.11, 1.12 User.py, 1.6, 1.7 UserInterface.py, 1.44, 1.45 main.py, 1.11, 1.12 CONFIG.py, 1.21, NONE
- Next message (by thread): rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list