Merge branch 'commandline'

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

diff --cc naoki/__init__.py
index b6af3b4eba59b644b35ddf18636fe163d2518372,6ef94bb804e3ed660161408fa8005deb0a6e8053..212f81fda98beff55ca7795ffb9b16c095eaf288
--- 1/naoki/__init__.py
--- 2/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/chroot.py
Simple merge

diff --cc naoki/constants.py
Simple merge

diff --cc naoki/package.py
index 0831af416e527a5ca514f59dc867620c12824e7f,c9c1f0194c67261e0fb96f710dbe78e66dc2cfc3..5c250eafc62b7d21d6f76639a78b8638e11acb09
--- 1/naoki/package.py
--- 2/naoki/package.py
+++ b/naoki/package.py
@@@ -173,12 -188,6 +187,8 @@@ Patches     
                self.config = config
                self.__fetch_data = None
  
-       def __str__(self):
-               return "%-20s %14s | %-24s | %s" % (self.name, "%s-%s" % \
-                       (self.version, self.release), self.group, self.summary)
- 
 +              self._getAllDeps = None
 +
        def __repr__(self):
                return "<Package %s>" % self.name