|
 |
485652 |
diff --git a/createrepo/__init__.py b/createrepo/__init__.py
|
|
|
485652 |
index dfdc8ab..452a3ac 100644
|
|
|
485652 |
--- a/createrepo/__init__.py
|
|
|
485652 |
+++ b/createrepo/__init__.py
|
|
|
485652 |
@@ -399,7 +399,17 @@ class MetaDataGenerator:
|
|
|
485652 |
self._setup_old_metadata_lookup()
|
|
|
485652 |
# rpms we're going to be dealing with
|
|
|
485652 |
if self.conf.pkglist:
|
|
|
485652 |
- packages = self.conf.pkglist
|
|
|
485652 |
+ packages = []
|
|
|
485652 |
+ for pkg in self.conf.pkglist:
|
|
|
485652 |
+ if '://' in pkg: # remote
|
|
|
485652 |
+ packages.append(pkg)
|
|
|
485652 |
+ continue
|
|
|
485652 |
+ path = os.path.join(self.conf.basedir, self.conf.directory, pkg)
|
|
|
485652 |
+ if os.access(path, os.R_OK):
|
|
|
485652 |
+ packages.append(pkg)
|
|
|
485652 |
+ continue
|
|
|
485652 |
+ # not fatal, yet
|
|
|
485652 |
+ self.callback.errorlog('Cannot read file: %s' % path)
|
|
|
485652 |
else:
|
|
|
485652 |
packages = self.getFileList(self.package_dir, '.rpm')
|
|
|
485652 |
|
|
|
485652 |
@@ -670,6 +680,8 @@ class MetaDataGenerator:
|
|
|
485652 |
return # EOF, EOF
|
|
|
485652 |
if stream is job.stdout:
|
|
|
485652 |
if line.startswith('*** '):
|
|
|
485652 |
+ if line == '*** \n':
|
|
|
485652 |
+ return True
|
|
|
485652 |
# get data, save to local files
|
|
|
485652 |
for out, size in zip(files, line[4:].split()):
|
|
|
485652 |
out.write(stream.read(int(size)))
|
|
|
485652 |
@@ -678,12 +690,14 @@ class MetaDataGenerator:
|
|
|
485652 |
else:
|
|
|
485652 |
self.callback.errorlog('Worker %s: %s' % (num, line.rstrip()))
|
|
|
485652 |
|
|
|
485652 |
+ err = 0
|
|
|
485652 |
for i, pkg in enumerate(pkgfiles):
|
|
|
485652 |
# insert cached packages
|
|
|
485652 |
save_keptpkgs(pkg)
|
|
|
485652 |
|
|
|
485652 |
# save output to local files
|
|
|
485652 |
- log_messages(i % self.conf.workers)
|
|
|
485652 |
+ if log_messages(i % self.conf.workers):
|
|
|
485652 |
+ err += 1
|
|
|
485652 |
|
|
|
485652 |
for (num, job) in worker_jobs.items():
|
|
|
485652 |
# process remaining messages on stderr
|
|
|
485652 |
@@ -697,6 +711,9 @@ class MetaDataGenerator:
|
|
|
485652 |
if not self.conf.quiet:
|
|
|
485652 |
self.callback.log("Workers Finished")
|
|
|
485652 |
|
|
|
485652 |
+ if err:
|
|
|
485652 |
+ raise MDError, "Failed to process %d package(s)." % err
|
|
|
485652 |
+
|
|
|
485652 |
for pkgfile in pkgfiles:
|
|
|
485652 |
if self.conf.deltas:
|
|
|
485652 |
try:
|