Commit 05730014 authored by Eric Timmons's avatar Eric Timmons
Browse files

cli less work: bundle update

parent 676ee7b0
Loading
Loading
Loading
Loading
+6 −11
Original line number Diff line number Diff line
@@ -5,18 +5,14 @@

(uiop:define-package #:clpm-cli/commands/bundle/update
    (:use #:cl
          #:clpm/bundle
          #:clpm-cli/commands/bundle/common
          #:clpm-cli/common-args
          #:clpm-cli/interface-defs
          #:clpm/context
          #:clpm/log)
  (:import-from #:adopt))
          #:clpm-cli/interface-defs)
  (:import-from #:adopt)
  (:import-from #:clpm))

(in-package #:clpm-cli/commands/bundle/update)

(setup-logger)

(define-string *help-string*
  "Update a bundle described in a clpmfile. Can either update the whole bundle
or a subset.
@@ -44,8 +40,7 @@ preference is to update everything to the latest version possible.")
                   *option-yes*)))

(define-cli-command (("bundle" "update") *bundle-update-ui*) (args options)
  (let* ((clpmfile-pathname (bundle-clpmfile-pathname))
         (yesp (gethash :yes options)))
    (bundle-update clpmfile-pathname :update-systems args
  (let ((yesp (gethash :yes options)))
    (clpm:bundle-update :update-systems args
                        :validate (make-diff-validate-fun :yesp yesp))
    t))
+36 −35
Original line number Diff line number Diff line
@@ -163,11 +163,12 @@ the lock file if necessary."
         :with-client with-client-p
         :ignore-inherited t)))))

(defun bundle-update (clpmfile-designator &key
(defun bundle-update (&key clpmfile
                        update-projects (validate (constantly t))
                        update-systems)
  (with-bundle-session (clpmfile)
    (let* ((*fetch-repo-automatically* (not (config-value :local)))
         (clpmfile (get-clpmfile clpmfile-designator))
           (clpmfile (get-clpmfile clpmfile))
           (lockfile-pathname (clpmfile-lockfile-pathname clpmfile))
           (*vcs-project-override-fun* (make-vcs-override-fun (clpmfile-pathname clpmfile)))
           (lockfile nil)
@@ -197,7 +198,7 @@ the lock file if necessary."
                                                         (setf changedp it)))
                                           :update-projects (or update-projects t)))
      (when changedp
      (save-context lockfile))))
        (save-context lockfile)))))

(defun bundle-exec (command args &key clpmfile
                                   with-client-p)
+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@
  (:export #:bundle-exec
           #:bundle-init
           #:bundle-install
           #:bundle-source-registry)
           #:bundle-source-registry
           #:bundle-update)
  ;; From client
  (:export #:client-asd-pathname)
  ;; From config