From b0199a36d74d7c6ecfd20fe7cf9228caea3f6481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Wed, 29 Jun 2005 06:49:08 +0000 Subject: [PATCH] * archType -> type * common arg'lari soyle sey et simdilik --- pisi-build | 12 +++--------- pisi/commonargs.py | 14 ++++++++++++++ pisi/specfile.py | 4 ++-- samples/amarok/amarok-1.3-beta1.pspec | 2 +- samples/logrotate/logrotate.pspec | 5 ++++- samples/popt/popt.pspec | 2 +- .../startup-notification.pspec | 4 ++-- 7 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 pisi/commonargs.py diff --git a/pisi-build b/pisi-build index 41bb0f93..2f182f23 100755 --- a/pisi-build +++ b/pisi-build @@ -15,17 +15,11 @@ from pisi.build import PisiBuild, PisiBuildError def main(): # common options - + usage = "usage: %prog [options] package-name.pspec" + import pisi.commonargs parser = OptionParser(usage=usage,version="%prog " + pisi.__version__) - parser.add_option("-D", "--destdir", action="store") - parser.add_option("-v", "--verbose", action="store_true", - dest="verbose", default=False, - help="detailed output") - parser.add_option("-d", "--debug", action="store_true", default=True) - parser.add_option("-n", "--dry-run", action="store_true", default=False, - help = "do not perform any action, just show what\ - would be done") + pisi.commonargs.add(parser) (options, args) = parser.parse_args() diff --git a/pisi/commonargs.py b/pisi/commonargs.py new file mode 100644 index 00000000..52883881 --- /dev/null +++ b/pisi/commonargs.py @@ -0,0 +1,14 @@ +from optparse import OptionParser + +def add(parser): + + parser.add_option("-D", "--destdir", action="store") + parser.add_option("-v", "--verbose", action="store_true", + dest="verbose", default=False, + help="detailed output") + parser.add_option("-d", "--debug", action="store_true", default=True) + parser.add_option("-n", "--dry-run", action="store_true", default=False, + help = "do not perform any action, just show what\ + would be done") + return parser + diff --git a/pisi/specfile.py b/pisi/specfile.py index ddb14d6b..1df48f82 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -96,7 +96,7 @@ class SourceInfo: archiveNode = getNode(node, "Archive") self.archiveUri = getNodeText(archiveNode).strip() self.archiveName = basename(self.archiveUri) - self.archiveType = getNodeAttribute(archiveNode, "archType") + self.archiveType = getNodeAttribute(archiveNode, "type") self.archiveSHA1 = getNodeAttribute(archiveNode, "sha1sum") patchElts = getAllNodes(node, "Patches/Patch") self.patches = [PatchInfo(p) for p in patchElts] @@ -116,7 +116,7 @@ class SourceInfo: xml.addTextNodeUnder(node, "IsA", self.isa) xml.addTextNodeUnder(node, "PartOf", self.partof) archiveNode = xml.addNodeUnder(node, "Archive") - archiveNode.setAttribute("archType", self.archiveType) + archiveNode.setAttribute("type", self.archiveType) archiveNode.setAttribute("sha1sum", self.archiveSHA1) for patch in self.patches: xml.addNodeUnder(node, "Patches", patch.elt(xml)) diff --git a/samples/amarok/amarok-1.3-beta1.pspec b/samples/amarok/amarok-1.3-beta1.pspec index 45a7e58f..f2897e5f 100644 --- a/samples/amarok/amarok-1.3-beta1.pspec +++ b/samples/amarok/amarok-1.3-beta1.pspec @@ -16,7 +16,7 @@ desktop:kde Amarok audio player Feature-rich audio player for KDE system. - + http://umn.dl.sourceforge.net/sourceforge/amarok/amarok-1.3-beta1.tar.bz2 diff --git a/samples/logrotate/logrotate.pspec b/samples/logrotate/logrotate.pspec index 41904dc0..89768fe5 100644 --- a/samples/logrotate/logrotate.pspec +++ b/samples/logrotate/logrotate.pspec @@ -14,7 +14,10 @@ ISA PARTOF Rotates, compresses, and mails system logs - ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/logrotate_3.6.5.orig.tar.gz + + ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/logrotate_3.6.5.orig.tar.gz + >=sys-apps/portage-2.0.47-r10 diff --git a/samples/popt/popt.pspec b/samples/popt/popt.pspec index e540dd2f..a7d22a29 100644 --- a/samples/popt/popt.pspec +++ b/samples/popt/popt.pspec @@ -25,7 +25,7 @@ 4) popt provides convience functions for parsing strings into argv[] style arrays - + ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz diff --git a/samples/startup-notification/startup-notification.pspec b/samples/startup-notification/startup-notification.pspec index f55fb969..1df115b5 100644 --- a/samples/startup-notification/startup-notification.pspec +++ b/samples/startup-notification/startup-notification.pspec @@ -18,8 +18,8 @@ rpm:archive Application startup notification and feedback library - - ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/startup-notification-0.8.tar.bz2 + + ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/startup-notification-0.8.tar.bz2 make