From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 13 Mar 2010 11:21:46 +0000 (+0100)
Subject: Merge branch 'commandline'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7858a49d0c4cb2b0c68b5e941cc40939a47db74;p=ipfire-3.x.git

Merge branch 'commandline'

Conflicts:
	naoki/__init__.py
	naoki/package.py
---

b7858a49d0c4cb2b0c68b5e941cc40939a47db74
diff --cc naoki/__init__.py
index b6af3b4eb,6ef94bb80..212f81fda
--- a/naoki/__init__.py
+++ b/naoki/__init__.py
@@@ -53,15 -37,12 +37,14 @@@ class Naoki(object)
  			curses.setupterm()
  			self.log.handlers[0].setFormatter(logger._ColorLogFormatter())
  
- 		if self.options.verbose == 0:
+ 		if config["quiet"]:
  			self.log.handlers[0].setLevel(logging.WARNING)
- 		elif self.options.verbose == 1:
+ 		else:
  			self.log.handlers[0].setLevel(logging.INFO)
- 		elif self.options.verbose == 2:
- 			self.log.handlers[0].setLevel(logging.DEBUG)
- 			logging.getLogger("naoki").propagate = 1
  
- 		fh = logging.handlers.RotatingFileHandler(self.config["log_file"],
++		if not os.path.isdir(LOGDIR):
++			os.makedirs(LOGDIR)
+ 		fh = logging.handlers.RotatingFileHandler(config["log_file"],
  			maxBytes=10*1024**2, backupCount=6)
  		fh.setFormatter(logging.Formatter("[%(levelname)s] %(message)s"))
  		fh.setLevel(logging.NOTSET)
diff --cc naoki/package.py
index 0831af416,c9c1f0194..5c250eafc
--- a/naoki/package.py
+++ b/naoki/package.py
@@@ -173,12 -188,6 +187,8 @@@ Patches     
  		self.config = config
  		self.__fetch_data = None
  
 +		self._getAllDeps = None
 +
- 	def __str__(self):
- 		return "%-20s %14s | %-24s | %s" % (self.name, "%s-%s" % \
- 			(self.version, self.release), self.group, self.summary)
- 
  	def __repr__(self):
  		return "<Package %s>" % self.name