- Add cache dir option
- Precreate (with error checking) cache and dest dirs - Use cache dir to cache downloads, hardlink to destdir - Move sys import into main section
This commit is contained in:
parent
2aad144643
commit
a41dfc13bd
@ -13,7 +13,6 @@
|
|||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
import sys
|
|
||||||
import yum
|
import yum
|
||||||
import os
|
import os
|
||||||
|
|
||||||
@ -119,6 +118,20 @@ def main():
|
|||||||
pkglist = get_packagelist(opts.comps)
|
pkglist = get_packagelist(opts.comps)
|
||||||
print pkglist
|
print pkglist
|
||||||
|
|
||||||
|
if not os.path.exists(opts.destdir):
|
||||||
|
try:
|
||||||
|
os.mkdirs(opts.destdir)
|
||||||
|
except OSError, e:
|
||||||
|
print >> sys.stderr, "Error: Cannot destination cache dir %s" % opts.destdir
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
if not os.path.exists(opts.cachedir):
|
||||||
|
try:
|
||||||
|
os.mkdirs(opts.cachedir)
|
||||||
|
except OSError, e:
|
||||||
|
print >> sys.stderr, "Error: Cannot create cache dir %s" % opts.destdir
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
mygather = Gather(opts, pkglist)
|
mygather = Gather(opts, pkglist)
|
||||||
mygather.getPackageObjects()
|
mygather.getPackageObjects()
|
||||||
mygather.downloadPackages()
|
mygather.downloadPackages()
|
||||||
@ -126,12 +139,17 @@ def main():
|
|||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
|
import sys
|
||||||
|
|
||||||
def get_arguments():
|
def get_arguments():
|
||||||
# hack job for now, I'm sure this could be better for our uses
|
# hack job for now, I'm sure this could be better for our uses
|
||||||
usage = "usage: %s [options]" % sys.argv[0]
|
usage = "usage: %s [options]" % sys.argv[0]
|
||||||
parser = OptionParser(usage=usage)
|
parser = OptionParser(usage=usage)
|
||||||
parser.add_option("--destdir", default=".", dest="destdir",
|
parser.add_option("--destdir", default=".", dest="destdir",
|
||||||
help='destination directory (defaults to current directory)')
|
help='destination directory (defaults to current directory)')
|
||||||
|
parser.add_option("--cachedir", default="./cache", dest="cachedir",
|
||||||
|
help='cache directory (defaults to cache subdir of current directory)')
|
||||||
|
parser.add_option("--comps", default="comps.xml", dest="comps",
|
||||||
parser.add_option("--comps", default="comps.xml", dest="comps",
|
parser.add_option("--comps", default="comps.xml", dest="comps",
|
||||||
help='comps file to use')
|
help='comps file to use')
|
||||||
parser.add_option("--yumconf", default="yum.conf", dest="yumconf",
|
parser.add_option("--yumconf", default="yum.conf", dest="yumconf",
|
||||||
|
Loading…
Reference in New Issue
Block a user