comparison bin/publishpackages.py @ 440:383d23c6bfde

Merged revisions 346-386 via svnmerge from svn+ssh://svn.wald.intevation.org/treepkg/branches/treepkg-status ........ r346 | bricks | 2010-07-07 17:40:48 +0200 (Mi, 07 Jul 2010) | 2 lines added classed for treepkg status xml generation ........ r347 | bricks | 2010-07-08 12:07:39 +0200 (Do, 08 Jul 2010) | 10 lines renamed new status dir to info because of a naming conflict with status.py let the user specify a treepkg name in the config the name is propagated to PackagerGroup [treepkg] name: <treepkgname> becomes: pg = PackagerGroup(...) pg.name ........ r348 | bricks | 2010-07-08 15:25:07 +0200 (Do, 08 Jul 2010) | 3 lines moved test file to test main dir fixed missing : after def statement ........ r349 | bricks | 2010-07-08 17:59:52 +0200 (Do, 08 Jul 2010) | 2 lines added treepkg_dir andd tracks_dir attributes to PackageGroup ........ r350 | bricks | 2010-07-08 18:00:32 +0200 (Do, 08 Jul 2010) | 2 lines changed <millpath> to <trackspath> ........ r351 | bricks | 2010-07-08 18:08:39 +0200 (Do, 08 Jul 2010) | 2 lines check if config file exists to get usefull error output ........ r352 | bricks | 2010-07-08 18:11:13 +0200 (Do, 08 Jul 2010) | 2 lines write first info about tracks ........ r353 | bricks | 2010-07-09 12:20:49 +0200 (Fr, 09 Jul 2010) | 2 lines get all log files ........ r354 | bricks | 2010-07-09 14:42:42 +0200 (Fr, 09 Jul 2010) | 2 lines added md5sum function ........ r355 | bricks | 2010-07-09 15:15:15 +0200 (Fr, 09 Jul 2010) | 4 lines implemented nearly all info only arch and os info are missing ........ r356 | bricks | 2010-07-09 16:19:17 +0200 (Fr, 09 Jul 2010) | 2 lines Bugfix: source was not defined ........ r357 | bricks | 2010-07-09 16:44:52 +0200 (Fr, 09 Jul 2010) | 3 lines fixed some typos added missing add_checksum methond ........ r358 | bricks | 2010-07-09 17:06:15 +0200 (Fr, 09 Jul 2010) | 2 lines fixed status line for revision ........ r359 | bricks | 2010-07-12 14:10:34 +0200 (Mo, 12 Jul 2010) | 2 lines let the user specify num revisions that should be shown in the info ........ r360 | bricks | 2010-07-12 14:21:39 +0200 (Mo, 12 Jul 2010) | 2 lines missed in last commit ........ r361 | bricks | 2010-07-12 17:06:22 +0200 (Mo, 12 Jul 2010) | 2 lines add os config statement ........ r362 | bricks | 2010-07-12 17:47:42 +0200 (Mo, 12 Jul 2010) | 3 lines moved packages and logs to revision tag implemented os and arch info ........ r363 | bricks | 2010-07-13 14:23:28 +0200 (Di, 13 Jul 2010) | 2 lines updated test readconfig for os config variable ........ r364 | bricks | 2010-07-13 14:24:14 +0200 (Di, 13 Jul 2010) | 2 lines moved common publish functions to a seperate module ........ r365 | bricks | 2010-07-13 16:26:11 +0200 (Di, 13 Jul 2010) | 2 lines moved arch info to each package info ........ r366 | bricks | 2010-07-13 18:46:17 +0200 (Di, 13 Jul 2010) | 2 lines inital checkin for new publishpackages processing ........ r367 | bricks | 2010-07-21 17:52:15 +0200 (Mi, 21 Jul 2010) | 2 lines implemented parsing from xml string ........ r368 | bricks | 2010-07-22 12:17:42 +0200 (Do, 22 Jul 2010) | 2 lines copy binary-all packages in all binary-xyz dirs ........ r369 | bricks | 2010-07-22 12:26:40 +0200 (Do, 22 Jul 2010) | 2 lines fixed small bugs ........ r370 | bricks | 2010-07-22 13:02:36 +0200 (Do, 22 Jul 2010) | 2 lines added a new root element which is called TreepkgRoot for Treepkg Info classes ........ r371 | bricks | 2010-07-22 13:09:52 +0200 (Do, 22 Jul 2010) | 3 lines fixed some small issues remember: run pychecker BEFORE the commit ........ r372 | bricks | 2010-07-22 18:01:43 +0200 (Do, 22 Jul 2010) | 2 lines improved publishdebianpackages and fixed a lot of bugs in the xml info parsing part ........ r373 | bricks | 2010-07-23 18:40:38 +0200 (Fr, 23 Jul 2010) | 2 lines implemented CacheDb to store copied Packages from build host ........ r374 | bricks | 2010-07-26 10:28:48 +0200 (Mo, 26 Jul 2010) | 2 lines moved data handling in publishdebianpackages into seperate module ........ r375 | bricks | 2010-07-26 11:42:07 +0200 (Mo, 26 Jul 2010) | 2 lines fixed some typos ........ r376 | bricks | 2010-07-26 12:12:40 +0200 (Mo, 26 Jul 2010) | 2 lines first version of incremental copying debian packages to cachedir ........ r377 | bricks | 2010-07-26 14:58:50 +0200 (Mo, 26 Jul 2010) | 2 lines incremental copying only changed debian packages ........ r378 | bricks | 2010-07-26 15:39:10 +0200 (Mo, 26 Jul 2010) | 3 lines use md5 instead of hashlib module (md5 is deprecated in favour of hashlib in python 2.5) ........ r379 | bricks | 2010-07-26 15:46:19 +0200 (Mo, 26 Jul 2010) | 2 lines make treepkg compatible to python 2.4 ........ r380 | bricks | 2010-07-26 15:50:49 +0200 (Mo, 26 Jul 2010) | 2 lines fixed last commit (db instead of sqlite3) ........ r381 | bricks | 2010-07-27 10:54:15 +0200 (Di, 27 Jul 2010) | 2 lines fixed wrong import statement ........ r382 | bricks | 2010-07-27 10:54:34 +0200 (Di, 27 Jul 2010) | 2 lines removed unnecessary debug output ........ r383 | bricks | 2010-07-27 18:28:22 +0200 (Di, 27 Jul 2010) | 2 lines check if upload hook is empty ........ r384 | bricks | 2010-07-28 09:35:21 +0200 (Mi, 28 Jul 2010) | 2 lines run rsync only an arch dirs that are present in the current treepkg ........ r385 | bricks | 2010-07-28 09:35:54 +0200 (Mi, 28 Jul 2010) | 2 lines add helper tool to list content of a cache db ........ r386 | bricks | 2010-07-28 10:33:48 +0200 (Mi, 28 Jul 2010) | 3 lines fixed a typo regex fails if option is empty ........
author Bjoern Ricks <bricks@intevation.de>
date Fri, 06 Aug 2010 13:28:47 +0000
parents 25d702bb13f9 c7f4da26f1d4
children eadcb1bb54e2
comparison
equal deleted inserted replaced
427:25d702bb13f9 440:383d23c6bfde
18 import treepkgcmd 18 import treepkgcmd
19 from treepkg.readconfig import read_config_section, convert_bool 19 from treepkg.readconfig import read_config_section, convert_bool
20 from treepkg.run import call, capture_output 20 from treepkg.run import call, capture_output
21 from treepkg.cmdexpand import cmdexpand 21 from treepkg.cmdexpand import cmdexpand
22 from treepkg.util import ensure_directory, listdir_abs 22 from treepkg.util import ensure_directory, listdir_abs
23 23 from treepkg.publish import remove_trailing_slashes, expand_filename
24 24 from treepkg.publish import prefix_for_remote_command, copy_to_publishdir
25 def remove_trailing_slashes(s):
26 return s.rstrip("/")
27
28 def expand_filename(filename):
29 """
30 Applies os.path.expanduser and os.path.expandvars to filename
31 """
32 return os.path.expandvars(os.path.expanduser(filename))
33 25
34 config_desc = ["distribution", "section", "num_newest", 26 config_desc = ["distribution", "section", "num_newest",
35 "build_user", "build_host", "build_listpackages", 27 "build_user", "build_host", "build_listpackages",
36 "publish_user", "publish_host", 28 "publish_user", "publish_host",
37 ("after_upload_hook", shlex.split), 29 ("after_upload_hook", shlex.split),
72 parser.add_option("--quiet", action="store_true", 64 parser.add_option("--quiet", action="store_true",
73 help=("Do not print progress meters or other" 65 help=("Do not print progress meters or other"
74 " informational output")) 66 " informational output"))
75 return parser.parse_args() 67 return parser.parse_args()
76 68
77 def prefix_for_remote_command(user, host):
78 """Returns the ssh call needed to run a command on a remote host.
79 If host is empty, the function assumes the command is to be run on
80 the local host as the same user that exectutes this function, so
81 that no ssh or other call is needed.
82 """
83 prefix = []
84 if host:
85 prefix.extend(["ssh", "%s@%s" % (user, host)])
86 return prefix
87
88
89 def copy_to_cache(variables, track, revision, arch, quiet): 69 def copy_to_cache(variables, track, revision, arch, quiet):
90 listpackages_vars = variables.copy() 70 listpackages_vars = variables.copy()
91 71
92 if arch == "source": 72 if arch == "source":
93 listpackages_vars["pkgtype"] = "--source" 73 listpackages_vars["pkgtype"] = "--source"
124 if quiet: 104 if quiet:
125 scp_flags.append("-q") 105 scp_flags.append("-q")
126 call(cmdexpand("scp -p @scp_flags @files $cachedir/", files=files, 106 call(cmdexpand("scp -p @scp_flags @files $cachedir/", files=files,
127 scp_flags=scp_flags, **variables)) 107 scp_flags=scp_flags, **variables))
128 108
129
130 def copy_to_publishdir(variables, dist, section, arch, quiet):
131 destdir = os.path.join(variables["publish_dir"], dist, section, arch)
132 remote_destdir = destdir
133 if variables["publish_host"]:
134 remote_destdir = (("%(publish_user)s@%(publish_host)s:" % variables)
135 + remote_destdir)
136 runremote = prefix_for_remote_command(variables["publish_user"],
137 variables["publish_host"])
138
139 call(cmdexpand("@runremote mkdir --parents $destdir",
140 runremote=runremote, destdir=destdir, **variables))
141 rsync_flags = []
142 if variables["publish_remove_old_packages"]:
143 rsync_flags.append("--delete")
144 if quiet:
145 rsync_flags.append("--quiet")
146 call(cmdexpand("rsync @rsync_flags -r --perms --times --omit-dir-times"
147 " $cachedir/ $remote_destdir/",
148 rsync_flags=rsync_flags, remote_destdir=remote_destdir,
149 **variables))
150
151
152 def publish_packages_arch(variables, track, revision, dist, section, arch, 109 def publish_packages_arch(variables, track, revision, dist, section, arch,
153 quiet): 110 quiet):
154 copy_to_cache(variables, track, revision, arch, quiet) 111 copy_to_cache(variables, track, revision, arch, quiet)
155 copy_to_publishdir(variables, dist, section, arch, quiet) 112 copy_to_publishdir(variables, dist, section, arch, quiet)
156 113
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)