summaryrefslogtreecommitdiffstats
path: root/createprestorepo
diff options
context:
space:
mode:
authorJonathan Dieter <jdieter@gmail.com>2007-05-07 21:19:56 +0300
committerJonathan Dieter <jdieter@gmail.com>2007-05-07 21:19:56 +0300
commitd60f28d66709c0c7fed26d19b1b7fb2c55439507 (patch)
tree338bdb4ed55b2290dd9577f2987d882a605c2505 /createprestorepo
parentc69bc9af8f3459610e810970c6222aee643e5594 (diff)
downloadpresto-d60f28d66709c0c7fed26d19b1b7fb2c55439507.tar.gz
presto-d60f28d66709c0c7fed26d19b1b7fb2c55439507.tar.xz
presto-d60f28d66709c0c7fed26d19b1b7fb2c55439507.zip
First release of createprestorepo, prunerepo and prunedrpms
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
Diffstat (limited to 'createprestorepo')
-rw-r--r--createprestorepo/COPYING339
-rw-r--r--createprestorepo/ChangeLog2
-rw-r--r--createprestorepo/Makefile3
-rw-r--r--createprestorepo/README22
-rw-r--r--[-rwxr-xr-x]createprestorepo/dumpMetadata.py9
-rwxr-xr-xcreateprestorepo/gendeltarpms.py275
-rwxr-xr-xcreateprestorepo/genprestometadata.py2
-rw-r--r--createprestorepo/packagelist.py362
8 files changed, 856 insertions, 158 deletions
diff --git a/createprestorepo/COPYING b/createprestorepo/COPYING
new file mode 100644
index 0000000..e77696a
--- /dev/null
+++ b/createprestorepo/COPYING
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/createprestorepo/ChangeLog b/createprestorepo/ChangeLog
new file mode 100644
index 0000000..2de29c0
--- /dev/null
+++ b/createprestorepo/ChangeLog
@@ -0,0 +1,2 @@
+* Tue May 7 2007 Jonathan Dieter <jdieter@gmail.com> - 0.1.0
+ - Initial release
diff --git a/createprestorepo/Makefile b/createprestorepo/Makefile
index a7f6004..51228f8 100644
--- a/createprestorepo/Makefile
+++ b/createprestorepo/Makefile
@@ -6,5 +6,6 @@ install:
install -m 755 makedeltarepo $(DESTDIR)/usr/bin/
mkdir -p $(DESTDIR)/usr/share/createprestorepo
install -m 755 genprestometadata.py $(DESTDIR)/usr/share/createprestorepo
- install -m 755 dumpMetadata.py $(DESTDIR)/usr/share/createprestorepo
+ install -m 644 dumpMetadata.py $(DESTDIR)/usr/share/createprestorepo
install -m 755 gendeltarpms.py $(DESTDIR)/usr/share/createprestorepo
+ install -m 644 packagelist.py $(DESTDIR)/usr/share/createprestorepo
diff --git a/createprestorepo/README b/createprestorepo/README
new file mode 100644
index 0000000..010fdd3
--- /dev/null
+++ b/createprestorepo/README
@@ -0,0 +1,22 @@
+Presto: A project to add delta rpm support into yum for Fedora users
+http://hosted.fedoraproject.org/projects/presto. A list of presto-enabled
+repositories is available there.
+
+createprestorepo: The presto repository creater
+
+Installation:
+=============
+1- Untar the package
+2- Run 'make install'
+
+Running:
+1- First run 'makedeltarepo <repo dir> <drpm dir>' where <repo dir> is the base
+ directory for your repository and <drpm dir> is the subdirectory you want to
+ create the deltarpms into
+2- Run 'createprestorepo <repo dir>' where <repo dir> is the base directory for
+ your repository.
+
+WARNING: createprestorepo does *NOT* yet know how to deal with the metadata
+ created by createrepo. You will have to manually move metadata from
+ .olddata to repodata after running both createprestorepo and
+ createrepo.
diff --git a/createprestorepo/dumpMetadata.py b/createprestorepo/dumpMetadata.py
index 5ad9cf5..6969400 100755..100644
--- a/createprestorepo/dumpMetadata.py
+++ b/createprestorepo/dumpMetadata.py
@@ -215,7 +215,7 @@ class RpmMetaData:
mode_cache = {}
- def __init__(self, ts, basedir, filename, options):
+ def __init__(self, ts, basedir, filename, options, is_drpm):
try:
stats = os.stat(os.path.join(basedir, filename))
self.size = stats[6]
@@ -233,8 +233,11 @@ class RpmMetaData:
self.pkgid = self.doChecksumCache(fo)
fo.seek(0)
(self.rangestart, self.rangeend) = byteranges(fo)
- fo.seek(self.rangeend)
- self._getOldInfo(fo)
+ self.is_drpm = False
+ if is_drpm:
+ fo.seek(self.rangeend)
+ self._getOldInfo(fo)
+ self.is_drpm = True
del fo
del fd
diff --git a/createprestorepo/gendeltarpms.py b/createprestorepo/gendeltarpms.py
index 5e0226f..fc4a9ca 100755
--- a/createprestorepo/gendeltarpms.py
+++ b/createprestorepo/gendeltarpms.py
@@ -20,17 +20,77 @@ import fnmatch, re
import rpmUtils.transaction, rpmUtils.miscutils
import commands, libxml2
import string
+from dumpMetadata import byteranges
+from packagelist import RpmItem, DrpmItem, PackageList
-SUFFIX='drpm'
-DRPMWORTHKEEPINGTHRESH=0.5
-DEBUG=1
+import gzip
+from zlib import error as zlibError
+from gzip import write32u, FNAME
-def getFileList(basepath, path, ext, filelist):
+
+DRPMWORTHKEEPINGTHRESH=0.7
+DEBUG=0
+
+def getDeltaNevr(filename):
+ """Get nevr for src rpm of a deltarpm. Return a tuple of (n, e, v, r)"""
+ def _getLength(in_data):
+ length = 0
+ for val in in_data:
+ length = length * 256
+ length += ord(val)
+ return length
+
+ def _stringToVersion(strng):
+ i = strng.find(':')
+ if i != -1:
+ epoch = strng[:i]
+ else:
+ epoch = '0'
+ j = strng.find('-')
+ if j != -1:
+ if strng[i + 1:j] == '':
+ version = None
+ else:
+ version = strng[i + 1:j]
+ release = strng[j + 1:]
+ else:
+ if strng[i + 1:] == '':
+ version = None
+ else:
+ version = strng[i + 1:]
+ release = None
+ return (epoch, version, release)
+
+ def _stringToNEVR(string):
+ i = string.rfind("-", 0, string.rfind("-")-1)
+ name = string[:i]
+ (epoch, ver, rel) = _stringToVersion(string[i+1:])
+ return (name, epoch, ver, rel)
+
+ (range_start, range_end) = byteranges(filename)
+ fd = open(filename, "r")
+ fd.seek(range_end)
+ try:
+ compobj = gzip.GzipFile("", "rb", 9, fd)
+ except:
+ raise zlibError("Data not stored in gzip format")
+
+ if compobj.read(4)[:3] != "DLT":
+ raise Exception("Not a deltarpm")
+
+ nevr_length = _getLength(compobj.read(4))
+ nevr = compobj.read(nevr_length).strip("\x00")
+ oldnevr = _stringToNEVR(nevr)
+ compobj.close()
+ return oldnevr
+
+
+def getFileList(path, ext, filelist):
"""Return all files in path matching ext, store them in filelist,
recurse dirs. Returns a list object"""
extlen = len(ext)
- totalpath = os.path.normpath(os.path.join(basepath, path))
+ totalpath = os.path.normpath(path)
try:
dir_list = os.listdir(totalpath)
except OSError, e:
@@ -39,159 +99,76 @@ def getFileList(basepath, path, ext, filelist):
for d in dir_list:
if os.path.isdir(totalpath + '/' + d):
- filelist = getFileList(basepath, os.path.join(path, d), ext, filelist)
- else:
- if string.lower(d[-extlen:]) == '%s' % (ext):
- if totalpath.find(basepath) == 0:
- if basepath != "":
- relativepath = totalpath.replace(basepath, "", 1)
- else:
- relativepath = totalpath
- relativepath = relativepath.lstrip("/")
- filelist.append(os.path.join(relativepath, d))
- else:
- raise "basepath '%s' not found in path '%s'" % (basepath, totalpath)
+ filelist = getFileList(os.path.join(totalpath, d), ext, filelist)
+ elif string.lower(d[-extlen:]) == '%s' % (ext):
+ filelist.append(os.path.join(totalpath, d))
return filelist
-
-def genDeltaRPM(ts, newrpm, oldrpm, srcdir, dstdir, old_delta = None):
- (f1,n1,e1,v1,r1,a1) = newrpm
- (f2,n2,e2,v2,r2,a2) = oldrpm
- hdr = rpmUtils.miscutils.hdrFromPackage(ts,f1)
- arch = hdr['arch']
- v12 = "_".join([v1,v2])
- r12 = "_".join([r1,r2])
- deltaRPMName= '%s/%s.%s.%s' % (dstdir, "-".join([n1,v12,r12]), a1, SUFFIX)
-
- # If the drpm doesn't exist, make it, else skip it
- if os.path.exists("%s%s" % (srcdir, deltaRPMName)) or os.path.exists("%s%s.dontdelta" % (srcdir, deltaRPMName)):
-# if e1 == e2:
-# print 'Using pre-generated delta rpm for %s.%s - %s.%s => %s.%s' % (n1, a1, v2, r2, v1, r1)
-# else:
-# print 'Using pre-generated delta rpm for %s.%s - %s:%s.%s => %s:%s.%s' % (n1, a1, e2, v2, r2, e1, v1, r1)
- if DEBUG:
- print "DEBUG skipping %s" % (deltaRPMName)
- else:
- generated = False
- prep_made = False
- if old_delta != None:
- (df,dn,de,dv,dr,da) = old_delta
- v1d = "_".join([v1,dv])
- r1d = "_".join([r1,dr])
- src_deltaRPMFile= '%s%s/%s.%s.%s' % (srcdir, dstdir, "-".join([n1,v1d,r1d]), a1, SUFFIX)
- vd2 = "_".join([dv,v2])
- rd2 = "_".join([dr,r2])
- old_deltaRPMFile= '%s%s/%s.%s.%s' % (srcdir, dstdir, "-".join([n1,vd2,rd2]), a1, SUFFIX)
- if os.access(old_deltaRPMFile, os.R_OK) and os.access(src_deltaRPMFile, os.R_OK):
- deltaCommand = 'combinedeltarpm %s %s %s%s' % (old_deltaRPMFile, src_deltaRPMFile, srcdir, deltaRPMName)
- if DEBUG:
- print deltaCommand
- prep_made = True
-
- if not prep_made:
- deltaCommand = 'makedeltarpm %s %s %s%s' % (f2, f1, srcdir, deltaRPMName)
- if DEBUG:
- print deltaCommand
-
- (code, out) = commands.getstatusoutput(deltaCommand)
- if code:
- #raise Exception("genDeltaRPM: exitcode was %s - Reported Error: %s" % (code, out))
- print "Error genDeltaRPM for %s: exitcode was %s - Reported Error: %s" % (n1, code, out)
- else:
- # Check whether or not we should keep the drpm
- if not drpmIsWorthKeeping(deltaRPMName, f1, srcdir):
- if DEBUG:
- print 'deleting %s' % (deltaRPMName)
- try:
- os.unlink("%s%s" % (srcdir, deltaRPMName))
- except Exception, e:
- print "Error deleting deltarpm %s" % (deltaRPMName), str(e)
- f = open("%s%s.dontdelta" % (srcdir, deltaRPMName), "w")
- f.close()
- else:
- if e1 == e2:
- print 'Generated delta rpm for %s.%s - %s-%s => %s-%s' % (n1, a1, v2, r2, v1, r1)
- else:
- print 'Generated delta rpm for %s.%s - %s:%s-%s => %s:%s-%s' % (n1, a1, e2, v2, r2, e1, v1, r1)
- return deltaRPMName
-
-def drpmIsWorthKeeping(deltaRPMName, newrpm, srcdir):
- newsize = os.path.getsize(newrpm)
- drpmsize = os.path.getsize("%s%s" % (srcdir, deltaRPMName))
- # Delete the drpm if it's too large
- if drpmsize > DRPMWORTHKEEPINGTHRESH * newsize:
- return False
- return True
-
-def createPrestoRepo(srcdir, dstdir):
+def createPrestoRepo(base_dir, drpm_dir):
ts = rpmUtils.transaction.initReadOnlyTransaction()
changed = False
# Create list of .rpm files.
# We don't use "glob", so sub-directories are supported.
- print 'Using source dir: %s' % srcdir
- print 'Using destination dir: %s' % dstdir
- if dstdir[-1] == "/":
- dstdir = dstdir[:-1]
- srcfiles = []
- srcfiles = getFileList("", srcdir, ".rpm", [])
- if not len(srcfiles):
+ print 'Using base dir: %s' % base_dir
+ print 'Using destination dir: %s' % drpm_dir
+
+ rpm_files = getFileList(base_dir, ".rpm", [])
+ drpm_files = getFileList(base_dir, ".drpm", [])
+ if not len(rpm_files):
print ' Nothing found.'
return changed
-# print srcfiles[0]
-# assert srcfiles[0].startswith(srcdir)
- # Check whether dstdir exists, and if it doesn't, create it
- if not os.access(dstdir, os.F_OK):
- os.makedirs(dstdir, 0755)
- elif not os.access(dstdir, os.W_OK):
- print 'ERROR: Unable to write to %s' % dstdir
+ # Check whether rel_dir exists, and if it doesn't, create it
+ if not os.access(drpm_dir, os.F_OK):
+ os.makedirs(drpm_dir, 0755)
+ elif not os.access(drpm_dir, os.W_OK):
+ print 'ERROR: Unable to write to %s' % drpm_dir
sys.exit(1)
- # Create map: rpm %name -> list of tuples (filename,name,e,v,r)
- newestsrcrpms = {}
- for f in srcfiles:
- hdr = rpmUtils.miscutils.hdrFromPackage(ts, f)
- nm = hdr['name'] + "." + hdr['arch']
- n = hdr['name']
- a = hdr['arch']
- v = hdr['version']
- r = hdr['release']
- e = hdr['epoch']
- if e is None:
- e = 0
- newestsrcrpms.setdefault(nm,[])
- newestsrcrpms[nm].append((f,n,e,v,r,a))
-
- # Now purge old src.rpm unless their %name matches a white-list pattern.
- for l in newestsrcrpms.itervalues():
- x = len(l)
-
- if x > 1:
- def sortByEVR(fnevr1, fnevr2):
- (f1,n1,e1,v1,r1,a1) = fnevr1
- (f2,n2,e2,v2,r2,a2) = fnevr2
- rc = rpmUtils.miscutils.compareEVR((e1,v1,r1),(e2,v2,r2))
- if rc == 0:
- return 0
- if rc > 0:
- return -1
- if rc < 0:
- return 1
+ # Add all rpms to PackageList
+ rpm_list = PackageList(base_dir, drpm_dir, DRPMWORTHKEEPINGTHRESH, DEBUG)
+ for f in rpm_files:
+ try:
+ hdr = rpmUtils.miscutils.hdrFromPackage(ts, f)
+ except:
+ print "Unable to open %s" % f
+ else:
+ nm = hdr['name'] + "." + hdr['arch']
+ e = hdr['epoch']
+ if e is None:
+ e = "0"
+
+ nevra = (hdr['name'], e, hdr['version'], hdr['release'], hdr['arch'])
+ rpm = RpmItem(nevra, f)
+ rpm_list.addRpm(rpm)
+
+ # Add all deltarpms to PackageList
+ for f in drpm_files:
+ try:
+ hdr = rpmUtils.miscutils.hdrFromPackage(ts, f)
+ except:
+ print "Unable to open %s" % f
+ else:
+ (sn, se, sv, sr) = getDeltaNevr(f)
- l.sort(sortByEVR) # highest first in list
-
- # Generate delta rpm
- finished_rpms = []
- if len(l) > 2:
- genDeltaRPM(ts, l[0], l[1], srcdir, dstdir)
- for rpm in l[2:]:
- genDeltaRPM(ts, l[0], rpm, srcdir, dstdir, l[1])
- else:
- for rpm in l[1:]:
- genDeltaRPM(ts, l[0], rpm, srcdir, dstdir)
-
+ nm = hdr['name'] + "." + hdr['arch']
+ e = hdr['epoch']
+ if e is None:
+ e = "0"
+
+ dst_nevra = (hdr['name'], e, hdr['version'], hdr['release'], hdr['arch'])
+ src_nevra = (sn, se, sv, sr, hdr['arch'])
+ drpm = DrpmItem(src_nevra, dst_nevra, f)
+ rpm_list.addDrpm(drpm)
+
+ if DEBUG:
+ rpm_list.dump()
+
+ # Build deltarpms
+ rpm_list.makeDeltaRpms()
+
def main(bin_rpm_path, delta_rpm_path):
assert rpmUtils.miscutils.compareEVR((1,2,3),(1,2,0)) > 0
assert rpmUtils.miscutils.compareEVR((0,1,2),(0,1,2)) == 0
@@ -207,14 +184,6 @@ if __name__ == '__main__':
bin_rpm_path = sys.argv[1]
delta_rpm_path = sys.argv[2]
- #### cfg = Utils.load_config_module(sys.argv[1])
-
- #### Utils.signer_gid_check(cfg.signersgid)
- #### os.umask(cfg.signersumask)
-
- #### for dist in sys.argv[2:]:
- #### if not cfg.archdict.has_key(dist):
- #### print "No distribution release named '%s' found" % dist
- #### sys.exit(errno.EINVAL)
main(bin_rpm_path, delta_rpm_path)
sys.exit(0)
+
diff --git a/createprestorepo/genprestometadata.py b/createprestorepo/genprestometadata.py
index 9d7a7a8..bbce09d 100755
--- a/createprestorepo/genprestometadata.py
+++ b/createprestorepo/genprestometadata.py
@@ -138,7 +138,7 @@ class MetaDataGenerator:
for file in files:
current+=1
try:
- mdobj = dumpMetadata.RpmMetaData(self.ts, self.cmds['basedir'], file, self.cmds)
+ mdobj = dumpMetadata.RpmMetaData(self.ts, self.cmds['basedir'], file, self.cmds, True)
if not self.cmds['quiet']:
if self.cmds['verbose']:
print '%d/%d - %s' % (current, len(files), file)
diff --git a/createprestorepo/packagelist.py b/createprestorepo/packagelist.py
new file mode 100644
index 0000000..5482572
--- /dev/null
+++ b/createprestorepo/packagelist.py
@@ -0,0 +1,362 @@
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Copyright (c) 2007 Jonathan Dieter
+
+import rpmUtils.miscutils
+import os
+import commands
+
+class RpmItem:
+ def __init__(self, nevra, f):
+ (self.name, self.epoch, self.version, self.release, self.arch) = nevra
+ self.epoch = str(self.epoch)
+ self.filename = f
+
+ def getNevra(self):
+ return (self.name, self.epoch, self.version, self.release, self.arch)
+
+ def __eq__(self, b):
+ if b == None:
+ return False
+ try:
+ # An RpmItem is equal to another RpmItem if the nevra's are equal
+ if self.getNevra() == b.getNevra():
+ return True
+ else:
+ return False
+ except:
+ # An RpmItem is equal to a DrpmItem if the nevra is equal to the drpm's destination nevra
+ if self.getNevra() == b.getDstNevra():
+ return True
+ else:
+ return False
+
+class DrpmItem:
+ def __init__(self, src_nevra, dst_nevra, f):
+ (self.src_name, self.src_epoch, self.src_version, self.src_release, self.src_arch) = src_nevra
+ (self.dst_name, self.dst_epoch, self.dst_version, self.dst_release, self.dst_arch) = dst_nevra
+ self.src_epoch = str(self.src_epoch)
+ self.dst_epoch = str(self.dst_epoch)
+ self.filename = f
+
+ def exists(self):
+ return self.filename != None
+
+ def getSrcNevra(self):
+ return (self.src_name, self.src_epoch, self.src_version, self.src_release, self.src_arch)
+
+ def getDstNevra(self):
+ return (self.dst_name, self.dst_epoch, self.dst_version, self.dst_release, self.dst_arch)
+
+ def getSrcDstNevra(self):
+ return [getSrcNevra(), getDstNevra()]
+
+ def __eq__(self, b):
+ if b == None:
+ return False
+ try:
+ # A DrpmItem is equal to another DrpmItem if both source and destination nevra's are equal
+ if self.getSrcDstNevra() == b.getSrcDstNevra():
+ return True
+ else:
+ return False
+ except:
+ # A DrpmItem is equal to an RpmItem if the destination nevra is equal to the rpm's nevra
+ if self.getDstNevra() == b.getNevra():
+ return True
+ else:
+ return False
+
+
+class PackageList:
+ def __init__(self, base_dir, drpm_dir, threshold, debug):
+ self.base_dir = base_dir
+ self.drpm_dir = drpm_dir
+ self.threshold = threshold
+ self.debug = debug
+ self.rpm_list = {}
+ self.sorted = False
+
+ def addRpm(self, rpm):
+ """Add RpmItem to PackageList"""
+ self.sorted = False
+ rpm_key = "%s.%s" % (rpm.name, rpm.arch)
+ self.rpm_list.setdefault(rpm_key, {})
+ self.rpm_list[rpm_key].setdefault("rpms", [])
+ self.rpm_list[rpm_key]["rpms"].append(rpm)
+
+ def addDrpm(self, drpm):
+ """Add DrpmItem to PackageList"""
+ self.sorted = False
+ rpm_key = "%s.%s" % (drpm.src_name, drpm.src_arch)
+ self.rpm_list.setdefault(rpm_key, {})
+ self.rpm_list[rpm_key].setdefault("drpms", [])
+ self.rpm_list[rpm_key]["drpms"].append(drpm)
+
+ def sort(self):
+ """Sort all rpms and deltarpms in reverse order. This is necessary before running any
+ methods that try to work with rpms and deltarpms"""
+ self.sorted = True
+ for rpm_type in self.rpm_list.values():
+ for key in rpm_type.keys():
+ if key == "rpms" and len(rpm_type["rpms"]) > 1:
+ def sortByEVR(rpm1, rpm2):
+ (n1,e1,v1,r1,a1) = rpm1.getNevra()
+ (n2,e2,v2,r2,a2) = rpm2.getNevra()
+ rc = rpmUtils.miscutils.compareEVR((e1,v1,r1),(e2,v2,r2))
+ if rc == 0:
+ return 0
+ if rc > 0:
+ return -1
+ if rc < 0:
+ return 1
+ rpm_type["rpms"].sort(sortByEVR) # highest first in list
+ elif key == "drpms" and len(rpm_type["drpms"]) > 1:
+ def sortByEVR(drpm1, drpm2, src=False):
+ if src:
+ (n1,e1,v1,r1,a1) = drpm1.getSrcNevra()
+ (n2,e2,v2,r2,a2) = drpm2.getSrcNevra()
+ else:
+ (n1,e1,v1,r1,a1) = drpm1.getDstNevra()
+ (n2,e2,v2,r2,a2) = drpm2.getDstNevra()
+ rc = rpmUtils.miscutils.compareEVR((e1,v1,r1),(e2,v2,r2))
+ if rc == 0:
+ if src:
+ return 0
+ else:
+ return sortByEVR(drpm1, drpm2, True)
+ if rc > 0:
+ return -1
+ if rc < 0:
+ return 1
+ rpm_type["drpms"].sort(sortByEVR) # highest first in list
+
+ def dump(self):
+ """Dump list of all packages and their rpms and deltarpms"""
+ if not self.sorted:
+ self.sort()
+ temp_list = []
+ for x in self.rpm_list.keys():
+ temp_list.append(x)
+ temp_list.sort()
+ for x in temp_list:
+ print x
+ if self.rpm_list[x].has_key("rpms"):
+ print " RPMS:"
+ for rpm in self.rpm_list[x]["rpms"]:
+ print " %s:%s-%s" % (rpm.epoch, rpm.version, rpm.release)
+ if self.rpm_list[x].has_key("drpms"):
+ print " DRPMS:"
+ for drpm in self.rpm_list[x]["drpms"]:
+ print " %s:%s-%s => %s:%s-%s" % (drpm.src_epoch, drpm.src_version, drpm.src_release, drpm.dst_epoch, drpm.dst_version, drpm.dst_release)
+
+ def __doWork(self, nevra1, nevra2, f1, deltaCommand):
+ (n1,e1,v1,r1,a1) = nevra1
+ (n2,e2,v2,r2,a2) = nevra2
+
+ deltaRPMName = os.path.join(self.drpm_dir, '%s-%s-%s_%s-%s.%s.drpm' % (n1, v2, r2, v1, r1, a1))
+ deltaCommand += deltaRPMName
+ if self.debug:
+ print deltaCommand
+
+ if os.path.exists("%s.dontdelta" % deltaRPMName):
+ f = open("%s.dontdelta" % deltaRPMName, "r")
+ drpmsize = f.readline()[:-1]
+ drpmsize = int(drpmsize)
+ if not self.__drpmIsWorthKeeping(drpmsize, f1):
+ return False
+ else:
+ if self.debug:
+ print "Original drpm is now worth creating...deleting %s%s.dontdelta" % (self.base_dir, deltaRPMName)
+ try:
+ os.unlink("%s.dontdelta" % deltaRPMName)
+ except Exception, e:
+ print "Error deleting %s.dontdelta" % os.path.basename(deltaRPMName), str(e)
+
+ (code, out) = commands.getstatusoutput(deltaCommand)
+ if code:
+ #raise Exception("genDeltaRPM: exitcode was %s - Reported Error: %s" % (code, out))
+ print "Error genDeltaRPM for %s: exitcode was %s - Reported Error: %s" % (n1, code, out)
+ return False
+ else:
+ # Check whether or not we should keep the drpm
+ drpmsize = os.path.getsize(deltaRPMName)
+ if not self.__drpmIsWorthKeeping(drpmsize, f1):
+ if self.debug:
+ print 'deleting %s' % (deltaRPMName)
+ f = open("%s.dontdelta" % deltaRPMName, "w")
+ f.write("%i\n" % os.path.getsize(deltaRPMName))
+ f.close()
+ try:
+ os.unlink(deltaRPMName)
+ except Exception, e:
+ print "Error deleting deltarpm %s" % os.path.basename(deltaRPMName), str(e)
+ return False
+ else:
+ if e1 == e2:
+ print 'Generated delta rpm for %s.%s - %s-%s => %s-%s' % (n1, a1, v2, r2, v1, r1)
+ else:
+ print 'Generated delta rpm for %s.%s - %s:%s-%s => %s:%s-%s' % (n1, a1, e2, v2, r2, e1, v1, r1)
+ drpm = DrpmItem(nevra2, nevra1, deltaRPMName)
+ self.addDrpm(drpm)
+ self.sort()
+ if self.debug:
+ self.dump()
+ return True
+
+ def __combineDeltaRpm(self, combine_list, dstrpm):
+ nevra1 = combine_list[-1].getDstNevra()
+ nevra2 = combine_list[0].getSrcNevra()
+ f1 = dstrpm.filename
+
+ deltaCommand = 'combinedeltarpm '
+ for drpm in combine_list:
+ deltaCommand += "%s " % drpm.filename
+
+ return self.__doWork(nevra1, nevra2, f1, deltaCommand)
+
+
+ def __buildDeltaRpm(self, srcrpm, dstrpm):
+ nevra1 = dstrpm.getNevra()
+ nevra2 = srcrpm.getNevra()
+
+ f1 = dstrpm.filename
+ f2 = srcrpm.filename
+ deltaCommand = 'makedeltarpm %s %s ' % (f2, f1)
+
+ return self.__doWork(nevra1, nevra2, f1, deltaCommand)
+
+ def __makeDeltaRpm(self, src_nevra, dstrpm, package):
+ foundSrc = False
+ foundDst = False
+ tempQueue = []
+ if package.has_key("drpms"):
+ for drpm in package["drpms"]:
+ if drpm.getDstNevra() == dstrpm.getNevra() and drpm.getSrcNevra() == src_nevra:
+ return True
+ if drpm.getSrcNevra() == src_nevra:
+ for item in tempQueue:
+ if drpm.getDstNevra() == item.getSrcNevra():
+ combine_list = [drpm, item]
+ return self.__combineDeltaRpm(combine_list, dstrpm)
+ elif drpm.getDstNevra() == dstrpm.getNevra():
+ tempQueue.append(drpm)
+
+ for rpm in package["rpms"]:
+ if rpm.getNevra() == src_nevra:
+ return self.__buildDeltaRpm(rpm, dstrpm)
+
+ print "Found nothing!"
+ return False
+
+
+ def makeDeltaRpms(self, OnlyLastPackage=True, DrpmsPerPackage=0):
+ """Create deltarpms for packages.
+ Attributes:
+ OnlyLastPackage (Boolean): Only create deltarpms for last package
+ DrpmsPerPackage (Int): Number of deltarpms to make for each package (0 = all possible)"""
+ if not self.sorted:
+ self.sort()
+ temp_list = []
+ for x in self.rpm_list.keys():
+ temp_list.append(x)
+ temp_list.sort()
+ if self.debug:
+ print "Building drpms"
+ for rpm_name in temp_list:
+ package = self.rpm_list[rpm_name]
+ if not package.has_key("rpms") or len(package["rpms"]) == 0:
+ if self.debug:
+ print "No rpms for %s: Doing nothing" % rpm_name
+ continue
+
+ if (not package.has_key("drpms") or len(package["drpms"]) == 0) and len(package["rpms"]) == 1:
+ if self.debug:
+ print "Only one rpm available for %s: Doing nothing" % rpm_name
+ continue
+
+ build_list = []
+
+ for rpm in package["rpms"]:
+ if [rpm.getNevra(), 1] not in build_list:
+ build_list.append([rpm.getNevra(), 1])
+
+ if package.has_key("drpms"):
+ for drpm in package["drpms"]:
+ if [drpm.getSrcNevra(), 1] not in build_list and [drpm.getSrcNevra(), 0] not in build_list:
+ build_list.append([drpm.getSrcNevra(), 0])
+ if [drpm.getDstNevra(), 1] not in build_list and [drpm.getDstNevra(), 0] not in build_list:
+ build_list.append([drpm.getDstNevra(), 0])
+
+ def sortByEVR(rpm1, rpm2):
+ (n1,e1,v1,r1,a1) = rpm1[0]
+ (n2,e2,v2,r2,a2) = rpm2[0]
+ rc = rpmUtils.miscutils.compareEVR((e1,v1,r1),(e2,v2,r2))
+ if rc == 0:
+ return 0
+ if rc > 0:
+ return -1
+ if rc < 0:
+ return 1
+ build_list.sort(sortByEVR)
+
+ if OnlyLastPackage:
+ if build_list[0][1] != 1:
+ continue
+
+ rpm = None
+ for x in package["rpms"]:
+ if x.getNevra() == build_list[0][0]:
+ rpm = x
+ break
+ if rpm == None:
+ continue
+
+ newpkg_list = [rpm]
+ else:
+ newpkg_list = []
+ for build in build_list[:-1]:
+ if build[1] != 1:
+ continue
+
+ rpm = None
+ for x in package["rpms"]:
+ if x.getNevra() == build[0]:
+ rpm = x
+ break
+ if rpm == None:
+ continue
+
+ newpkg_list.append(rpm)
+
+ for newpkg in newpkg_list:
+ start = False
+ count = 0
+ for build in build_list:
+ if start:
+ self.__makeDeltaRpm(build[0], newpkg, package)
+ if not self.sorted:
+ self.sort()
+ count += 1
+ if count > DrpmsPerPackage and DrpmsPerPackage != 0:
+ break
+ if build[0] == newpkg.getNevra():
+ start = True
+
+ def __drpmIsWorthKeeping(self, drpmsize, newrpm):
+ newsize = os.path.getsize(newrpm)
+ # Delete the drpm if it's too large
+ if drpmsize > self.threshold * newsize:
+ return False
+ return True