summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-02-02 16:42:00 +0000
committerJeremy Katz <katzj@redhat.com>2005-02-02 16:42:00 +0000
commit9e33ac36deda14a22d594ae208e71187fd203f0e (patch)
treea3ba22a3a3171c66b5c58ba5aaab4e2bcf6a1267
parent7fde3edf34d313cef15f8f6874dad1f4b21b9c85 (diff)
downloadanaconda-9e33ac36deda14a22d594ae208e71187fd203f0e.tar.gz
anaconda-9e33ac36deda14a22d594ae208e71187fd203f0e.tar.xz
anaconda-9e33ac36deda14a22d594ae208e71187fd203f0e.zip
2005-02-02 Jeremy Katz <katzj@redhat.com>
* scripts/splittree.py: Allow not creating SRPM CDs by passing --src-discs=0. Based on a patch from Armijn Hemel (#119070)
-rw-r--r--ChangeLog3
-rw-r--r--scripts/splittree.py17
2 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 745475163..fba1c3a3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-02-02 Jeremy Katz <katzj@redhat.com>
+ * scripts/splittree.py: Allow not creating SRPM CDs by passing
+ --src-discs=0. Based on a patch from Armijn Hemel (#119070)
+
* scripts/upd-instroot: Create reduced font for bogl at
upd-instroot time (#92146, #140208)
diff --git a/scripts/splittree.py b/scripts/splittree.py
index 3e8592f05..b615e906e 100644
--- a/scripts/splittree.py
+++ b/scripts/splittree.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2003 Red Hat, Inc.
+# Copyright (C) 2003-2005 Red Hat, Inc.
#
# 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
@@ -99,7 +99,6 @@ and RPMs. Set to 1 to turn on."""
self.logfile = []
-
def getSize(seld, path, blocksize=None):
"""Gets the size as reported by du -s"""
@@ -232,10 +231,13 @@ and RPMs. Set to 1 to turn on."""
self.linkFiles(self.dist_dir, "%s-disc%d" %(self.dist_dir, i), self.common_files)
self.createDiscInfo(i)
- for i in range(self.src_list[0], self.src_list[-1] + 1):
- os.makedirs("%s-disc%d/SRPMS" % (self.dist_dir, i))
- self.linkFiles(self.dist_dir, "%s-disc%d" %(self.dist_dir, i), self.common_files)
- self.createDiscInfo(i)
+ if (self.src_discs != 0):
+ for i in range(self.src_list[0], self.src_list[-1] + 1):
+ os.makedirs("%s-disc%d/SRPMS" % (self.dist_dir, i))
+ self.linkFiles(self.dist_dir,
+ "%s-disc%d" %(self.dist_dir, i),
+ self.common_files)
+ self.createDiscInfo(i)
@@ -378,7 +380,8 @@ and RPMs. Set to 1 to turn on."""
"""Just runs everything"""
self.createSplitDirs()
self.splitRPMS()
- self.splitSRPMS()
+ if (self.srcdiscs != 0):
+ self.splitSRPMS()
return self.logfile