August 2005 - scm-commits - Fedora Mailing-Lists

by fedora-extras-commits＠redhat.com

Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15928 Modified Files: ChangeLog Log Message: 2005-08-31 Dan Williams <dcbw(a)redhat.com> * builder/builder.py - Reset self._die so we don't kill cleanup processes Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- ChangeLog 31 Aug 2005 18:25:49 -0000 1.110 +++ ChangeLog 31 Aug 2005 18:29:16 -0000 1.111 @@ -1,5 +1,10 @@ 2005-08-31 Dan Williams <dcbw(a)redhat.com> + * builder/builder.py + - Reset self._die so we don't kill cleanup processes + +2005-08-31 Dan Williams <dcbw(a)redhat.com> + * server/UserInterface.py - Fix more target-related stuff

14 years, 6 months

1
0
0 / 0

extras-buildsys/builder builder.py,1.31.2.2,1.31.2.3

by fedora-extras-commits＠redhat.com

Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15882/builder Modified Files: Tag: STABLE_0_3 builder.py Log Message: 2005-08-31 Dan Williams <dcbw(a)redhat.com> * builder/builder.py - Reset self._die so we don't kill cleanup processes Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.31.2.2 retrieving revision 1.31.2.3 diff -u -r1.31.2.2 -r1.31.2.3 --- builder.py 31 Aug 2005 01:49:29 -0000 1.31.2.2 +++ builder.py 31 Aug 2005 18:28:59 -0000 1.31.2.3 @@ -114,6 +114,7 @@ def _handle_death(self): self._log("Killing build process...\n") + self._die = False # Don't try to kill a running cleanup process if self._status != 'cleanup' and self._childpid: try:

14 years, 6 months

1
0
0 / 0

extras-buildsys ChangeLog,1.97.2.13,1.97.2.14

by fedora-extras-commits＠redhat.com

Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15882 Modified Files: Tag: STABLE_0_3 ChangeLog Log Message: 2005-08-31 Dan Williams <dcbw(a)redhat.com> * builder/builder.py - Reset self._die so we don't kill cleanup processes Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.97.2.13 retrieving revision 1.97.2.14 diff -u -r1.97.2.13 -r1.97.2.14 --- ChangeLog 31 Aug 2005 01:52:11 -0000 1.97.2.13 +++ ChangeLog 31 Aug 2005 18:28:58 -0000 1.97.2.14 @@ -1,3 +1,8 @@ +2005-08-31 Dan Williams <dcbw(a)redhat.com> + + * builder/builder.py + - Reset self._die so we don't kill cleanup processes + 2005-08-30 Dan Williams <dcbw(a)redhat.com> * builder/builder.py

14 years, 6 months

1
0
0 / 0

extras-buildsys/server UserInterface.py,1.51,1.52

by fedora-extras-commits＠redhat.com

Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15829/server Modified Files: UserInterface.py Log Message: 2005-08-31 Dan Williams <dcbw(a)redhat.com> * server/UserInterface.py - Fix more target-related stuff Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- UserInterface.py 29 Aug 2005 17:48:19 -0000 1.51 +++ UserInterface.py 31 Aug 2005 18:25:50 -0000 1.52 @@ -80,6 +80,22 @@ return True return False +def resolve_target(cfg, alias): + target_cfg = None + try: + target_cfg = cfg.resolve_target_user_alias(alias) + except Config.InvalidUserAliasException: + pass + + # If it wasn't an alias, try actual target names + if not target_cfg: + for tcfg in cfg.targets(): + if alias == tcfg.target_string(): + target_cfg = tcfg + break + return target_cfg + + class UserInterface: """ Base UserInterface class. NO AUTHENTICATION. Subclass this to provide some. @@ -152,18 +168,17 @@ "Submit a bug report?" % (source, target_alias, package)) return (-1, "The package name contained an illegal character.", -1) - try: - target_cfg = self._cfg.resolve_target_user_alias(target_alias) - except Config.InvalidUserAliasException, e: + target_cfg = resolve_target(self._cfg, target_alias) + if not target_cfg: self.email_result(email, source, "Error setting up build for %s on "\ "%s: target does not exist." % (source, target_alias)) return (-1, "This build server does not support the target %s." % target_alias, -1) - else: - print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, source, target_alias, email) - req = self._bm.create_job_request(email, package, source, target_cfg.target_dict(), buildreq, time.time()) - self._bm.enqueue(req) - uid = self._wait_for_uid(req) - return (0, "Success: package has been queued.", uid) + + print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, source, target_alias, email) + req = self._bm.create_job_request(email, package, source, target_cfg.target_dict(), buildreq, time.time()) + self._bm.enqueue(req) + uid = self._wait_for_uid(req) + return (0, "Success: package has been queued.", uid) def requeue(self, uid): uid = validate_uid(uid) @@ -252,10 +267,10 @@ sql_args.append('uid<%d' % uid) if args_dict.has_key('target') and args_dict['target']: - try: - target_cfg = self._cfg.resolve_target_user_alias(args_dict['target']) - except Config.InvalidUserAliasException: + target_cfg = resolve_target(self._cfg, args_dict['target']) + if not target_cfg: return (-1, "Error: Invalid target.", []) + sql_args.append('target_distro="%s"' % target_cfg.distro()) sql_args.append('target_target="%s"' % target_cfg.target()) sql_args.append('target_repo="%s"' % target_cfg.repo()) @@ -397,7 +412,8 @@ jobrec['version'] = job['version'] jobrec['release'] = job['release'] base_url = self._server_cfg.get_str("UI", "log_url") - log_url = PackageJob.make_job_log_url(base_url, jobrec['target'], + target_str = "%s-%s-%s" % (jobrec['target_distro'], jobrec['target_target'], jobrec['target_repo']) + log_url = PackageJob.make_job_log_url(base_url, target_str, str(uid), jobrec['package'], jobrec['version'], jobrec['release']) if log_url and len(log_url): @@ -445,7 +461,7 @@ def targets(self): targets = [] for target_cfg in self._cfg.targets(): - targets.append(target_cfg.get_str("General", "name")) + targets.append(target_cfg.target_string()) return targets def pause(self, paused):

14 years, 6 months

1
0
0 / 0

extras-buildsys ChangeLog,1.109,1.110

by fedora-extras-commits＠redhat.com

Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15829 Modified Files: ChangeLog Log Message: 2005-08-31 Dan Williams <dcbw(a)redhat.com> * server/UserInterface.py - Fix more target-related stuff Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- ChangeLog 31 Aug 2005 18:10:38 -0000 1.109 +++ ChangeLog 31 Aug 2005 18:25:49 -0000 1.110 @@ -1,5 +1,10 @@ 2005-08-31 Dan Williams <dcbw(a)redhat.com> + * server/UserInterface.py + - Fix more target-related stuff + +2005-08-31 Dan Williams <dcbw(a)redhat.com> + * builder/builder.py server/Builder.py - Expose "num slots" values to build server

14 years, 6 months

1
0
0 / 0

extras-buildsys/server Builder.py,1.17,1.18

by fedora-extras-commits＠redhat.com

Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15738/server Modified Files: Builder.py Log Message: 2005-08-31 Dan Williams <dcbw(a)redhat.com> * builder/builder.py server/Builder.py - Expose "num slots" values to build server Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Builder.py 31 Aug 2005 15:42:44 -0000 1.17 +++ Builder.py 31 Aug 2005 18:10:44 -0000 1.18 @@ -40,6 +40,7 @@ self._manager = manager self._jobs = {} self._free_slots = 0 + self._num_slots = 0 self._address = address self._alive = True self._stop = False @@ -79,6 +80,16 @@ except: pass + self._num_slots = self._get_num_slots() + + def _get_num_slots(self): + num_slots = self._num_slots + try: + num_slots = self._server.num_slots() + except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): + pass + return num_slots + def _building_jobs(self): jobs = {} try: @@ -307,5 +318,7 @@ builder_dict['arches'] = arches builder_dict['alive'] = self._alive + builder_dict['num_slots'] = self._num_slots + builder_dict['free_slots'] = self._free_slots return builder_dict

14 years, 6 months

1
0
0 / 0

extras-buildsys/builder builder.py,1.38,1.39

by fedora-extras-commits＠redhat.com

Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15738/builder Modified Files: builder.py Log Message: 2005-08-31 Dan Williams <dcbw(a)redhat.com> * builder/builder.py server/Builder.py - Expose "num slots" values to build server Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- builder.py 31 Aug 2005 15:42:44 -0000 1.38 +++ builder.py 31 Aug 2005 18:10:38 -0000 1.39 @@ -668,6 +668,9 @@ self._building_jobs_lock.release() return (jobs, free) + def num_slots(self): + return self._max_jobs + def job_status(self, uniqid): try: job = self._all_jobs[uniqid]

14 years, 6 months

1
0
0 / 0

extras-buildsys ChangeLog,1.108,1.109

by fedora-extras-commits＠redhat.com

Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15738 Modified Files: ChangeLog Log Message: 2005-08-31 Dan Williams <dcbw(a)redhat.com> * builder/builder.py server/Builder.py - Expose "num slots" values to build server Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- ChangeLog 31 Aug 2005 01:56:37 -0000 1.108 +++ ChangeLog 31 Aug 2005 18:10:38 -0000 1.109 @@ -1,3 +1,9 @@ +2005-08-31 Dan Williams <dcbw(a)redhat.com> + + * builder/builder.py + server/Builder.py + - Expose "num slots" values to build server + 2005-08-30 Dan Williams <dcbw(a)redhat.com> * builder/builder.py

14 years, 6 months

1
0
0 / 0

extras-buildsys/common CommonErrors.py,1.7,1.8

by fedora-extras-commits＠redhat.com

Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15638/common Modified Files: CommonErrors.py Log Message: Dont' traceback if error is not a tuple Index: CommonErrors.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/CommonErrors.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CommonErrors.py 8 Jul 2005 18:16:22 -0000 1.7 +++ CommonErrors.py 31 Aug 2005 18:06:09 -0000 1.8 @@ -49,11 +49,14 @@ Identify common network errors that mean we cannot connect to the server """ - if e[0] == 111: # Connection refused - return True - elif e[0] == 104: # Connection reset by peer - return True - elif e[0] == 61: # Connection refused + try: + if e[0] == 111: # Connection refused + return True + elif e[0] == 104: # Connection reset by peer + return True + elif e[0] == 61: # Connection refused + return True + except IndexError: return True return False

14 years, 6 months

1
0
0 / 0

owners owners.list,1.154,1.155

by fedora-extras-commits＠redhat.com

14 years, 6 months

1
0
0 / 0

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits August 2005